diff options
| author | Andreas Tobler <andreast@FreeBSD.org> | 2015-12-06 18:37:17 +0000 |
|---|---|---|
| committer | Andreas Tobler <andreast@FreeBSD.org> | 2015-12-06 18:37:17 +0000 |
| commit | 3637bd7a43261512e653edc39962c9aaefa5d6fe (patch) | |
| tree | 7422ac658a0a26627a3bcd5ecc7ad6a4c4a2cca5 | |
| parent | 063e6270d0667adb7335fa91f5f30f5bd6afab91 (diff) | |
| download | freebsd-ports-3637bd7a43261512e653edc39962c9aaefa5d6fe.zip | |
Add two fixes which have missed the gcc-5.3 release date:
- Fix --disable-bootstrap build.
- Add ELFv2 support for FreeBSD PowerPC64.
Approved by: gerald (maintainer)
| -rw-r--r-- | lang/gcc5/files/patch-build-without-bootstrap | 25 | ||||
| -rw-r--r-- | lang/gcc5/files/patch-gcc-freebsd-powerpc64 | 29 |
2 files changed, 54 insertions, 0 deletions
diff --git a/lang/gcc5/files/patch-build-without-bootstrap b/lang/gcc5/files/patch-build-without-bootstrap new file mode 100644 index 000000000000..6bd7d528c9c3 --- /dev/null +++ b/lang/gcc5/files/patch-build-without-bootstrap @@ -0,0 +1,25 @@ +--- UTC +Index: Makefile.def +=================================================================== +--- Makefile.def (revision 230942) ++++ Makefile.def (working copy) +@@ -534,6 +534,7 @@ + // on libgcc and newlib/libgloss. + lang_env_dependencies = { module=libjava; cxx=true; }; + lang_env_dependencies = { module=libitm; cxx=true; }; ++lang_env_dependencies = { module=libffi; cxx=true; }; + lang_env_dependencies = { module=libcilkrts; cxx=true; }; + lang_env_dependencies = { module=liboffloadmic; cxx=true; }; + lang_env_dependencies = { module=newlib; no_c=true; }; +Index: Makefile.in +=================================================================== +--- Makefile.in (revision 230942) ++++ Makefile.in (working copy) +@@ -51034,6 +51034,7 @@ + + + configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss ++configure-target-libffi: maybe-all-target-libstdc++-v3 + + configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss + configure-target-libjava: maybe-all-target-libstdc++-v3 diff --git a/lang/gcc5/files/patch-gcc-freebsd-powerpc64 b/lang/gcc5/files/patch-gcc-freebsd-powerpc64 new file mode 100644 index 000000000000..fa9c3a3354b7 --- /dev/null +++ b/lang/gcc5/files/patch-gcc-freebsd-powerpc64 @@ -0,0 +1,29 @@ +--- gcc/config/rs6000/freebsd64.h 2015-11-28 09:06:13.019999000 -0800 ++++ gcc/config/rs6000/freebsd64.h 2015-11-28 09:16:10.459373000 -0800 +@@ -65,6 +65,13 @@ + #define INVALID_64BIT "-m%s not supported in this configuration" + #define INVALID_32BIT INVALID_64BIT + ++/* Use LINUX64 instead of FREEBSD64 for compat with e.g. sysv4le.h */ ++#ifdef LINUX64_DEFAULT_ABI_ELFv2 ++#define ELFv2_ABI_CHECK (rs6000_elf_abi != 1) ++#else ++#define ELFv2_ABI_CHECK (rs6000_elf_abi == 2) ++#endif ++ + #undef SUBSUBTARGET_OVERRIDE_OPTIONS + #define SUBSUBTARGET_OVERRIDE_OPTIONS \ + do \ +@@ -84,6 +91,12 @@ + rs6000_isa_flags &= ~OPTION_MASK_RELOCATABLE; \ + error (INVALID_64BIT, "relocatable"); \ + } \ ++ if (ELFv2_ABI_CHECK) \ ++ { \ ++ rs6000_current_abi = ABI_ELFv2; \ ++ if (dot_symbols) \ ++ error ("-mcall-aixdesc incompatible with -mabi=elfv2"); \ ++ } \ + if (rs6000_isa_flags & OPTION_MASK_EABI) \ + { \ + rs6000_isa_flags &= ~OPTION_MASK_EABI; \ |