diff options
| author | Andreas Tobler <andreast@FreeBSD.org> | 2019-03-19 22:03:17 +0000 |
|---|---|---|
| committer | Andreas Tobler <andreast@FreeBSD.org> | 2019-03-19 22:03:17 +0000 |
| commit | ddf9ce843421d3de2c7d49104e6db2a1e5ece7f2 (patch) | |
| tree | f859f5bf858f385085ac94e94f0c5e690f4bbd61 /lang/gcc9-devel/files | |
| parent | Fix build after QT4 removal (diff) | |
This commit brings multilib support for gcc on amd64. This means you can
compile and execute 32-bit binaries with gcc.
The gcc part will be upstreamed as soon as gcc trunk opens for new commits.
On the release front, gcc8, we will merge this commit after a week or so.
Approved by: gerald@
Diffstat (limited to 'lang/gcc9-devel/files')
| -rw-r--r-- | lang/gcc9-devel/files/patch-amd64-gcc-multilib-support | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/lang/gcc9-devel/files/patch-amd64-gcc-multilib-support b/lang/gcc9-devel/files/patch-amd64-gcc-multilib-support new file mode 100644 index 000000000000..ffae93210614 --- /dev/null +++ b/lang/gcc9-devel/files/patch-amd64-gcc-multilib-support @@ -0,0 +1,73 @@ +--- UTC +Index: gcc/config.gcc +=================================================================== +--- gcc/config.gcc (revision 269726) ++++ gcc/config.gcc (working copy) +@@ -4925,8 +4925,11 @@ + ;; + i[34567]86-*-dragonfly* | x86_64-*-dragonfly*) + ;; +- i[34567]86-*-freebsd* | x86_64-*-freebsd*) ++ i[34567]86-*-freebsd*) + ;; ++ x86_64-*-freebsd*) ++ tmake_file="${tmake_file} i386/t-freebsd64" ++ ;; + ia64*-*-linux*) + ;; + +Index: gcc/config/i386/freebsd64.h +=================================================================== +--- gcc/config/i386/freebsd64.h (revision 269733) ++++ gcc/config/i386/freebsd64.h (working copy) +@@ -31,7 +31,7 @@ + + #undef LINK_SPEC + #define LINK_SPEC "\ +- %{m32:-m elf_i386_fbsd} \ ++ %{m32:-m elf_i386_fbsd}%{!m32:-m elf_x86_64_fbsd} \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ + %{v:-V} \ + %{assert*} %{R*} %{rpath*} %{defsym*} \ +@@ -42,3 +42,6 @@ + -dynamic-linker %(fbsd_dynamic_linker) } \ + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}" ++ ++#undef MULTILIB_DEFAULTS ++#define MULTILIB_DEFAULTS { "m64" } +Index: gcc/config/i386/t-freebsd64 +=================================================================== +--- gcc/config/i386/t-freebsd64 (nonexistent) ++++ gcc/config/i386/t-freebsd64 (working copy) +@@ -0,0 +1,30 @@ ++# Copyright (C) 2019 Free Software Foundation, Inc. ++# ++# This file is part of GCC. ++# ++# GCC is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++# ++# GCC is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GCC; see the file COPYING3. If not see ++# <http://www.gnu.org/licenses/>. ++ ++# The 32-bit libraries are found in /usr/lib32 ++ ++# To support i386 and x86-64, the directory structrue ++# should be: ++# ++# /lib has x86-64 libraries. ++# /lib32 has i386 libraries. ++# ++ ++MULTILIB_OPTIONS = m32 ++MULTILIB_DIRNAMES = 32 ++MULTILIB_OSDIRNAMES = ../lib32 |