diff options
| author | andreast <andreast@FreeBSD.org> | 2016-01-09 19:56:21 +0800 |
|---|---|---|
| committer | andreast <andreast@FreeBSD.org> | 2016-01-09 19:56:21 +0800 |
| commit | 7f4a67de4b00ef465c17c431e48e34c4e3572270 (patch) | |
| tree | 7d4d93cd2471c4aa261f7db1cf9c8bde6f19c3c4 /lang | |
| parent | 0e97114d07564a0a1b67ca85c6aa546771a2fcf2 (diff) | |
| download | freebsd-ports-graphics-7f4a67de4b00ef465c17c431e48e34c4e3572270.tar.gz freebsd-ports-graphics-7f4a67de4b00ef465c17c431e48e34c4e3572270.tar.zst freebsd-ports-graphics-7f4a67de4b00ef465c17c431e48e34c4e3572270.zip | |
Bring the fixes mentioned below from upstream to our gcc-5.3 release port.
[1]: https://gcc.gnu.org/ml/gcc-patches/2015-12/msg02057.html
[2]: https://gcc.gnu.org/ml/gcc-patches/2015-12/msg00685.html
PR: 205394, 205440
Approved by: gerald (maintainer)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc5/files/patch-gcc-freebsd-powerpc64 | 54 |
1 files changed, 52 insertions, 2 deletions
diff --git a/lang/gcc5/files/patch-gcc-freebsd-powerpc64 b/lang/gcc5/files/patch-gcc-freebsd-powerpc64 index fa9c3a3354b..efa2f1155ae 100644 --- a/lang/gcc5/files/patch-gcc-freebsd-powerpc64 +++ b/lang/gcc5/files/patch-gcc-freebsd-powerpc64 @@ -1,5 +1,5 @@ ---- 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 +--- gcc/config/rs6000/freebsd64.h.orig 2015-12-23 21:56:41.030016000 +0100 ++++ gcc/config/rs6000/freebsd64.h 2015-12-23 21:56:28.343015000 +0100 @@ -65,6 +65,13 @@ #define INVALID_64BIT "-m%s not supported in this configuration" #define INVALID_32BIT INVALID_64BIT @@ -27,3 +27,53 @@ if (rs6000_isa_flags & OPTION_MASK_EABI) \ { \ rs6000_isa_flags &= ~OPTION_MASK_EABI; \ +@@ -154,22 +167,7 @@ + { "link_os_freebsd_spec32", LINK_OS_FREEBSD_SPEC32 }, \ + { "link_os_freebsd_spec64", LINK_OS_FREEBSD_SPEC64 }, + +-#define FREEBSD_DYNAMIC_LINKER32 "/libexec/ld-elf32.so.1" +-#define FREEBSD_DYNAMIC_LINKER64 "/libexec/ld-elf.so.1" +- +-#define LINK_OS_FREEBSD_SPEC_DEF32 "\ +- %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ +- %{v:-V} \ +- %{assert*} %{R*} %{rpath*} %{defsym*} \ +- %{shared:-Bshareable %{h*} %{soname*}} \ +- %{!shared: \ +- %{!static: \ +- %{rdynamic: -export-dynamic} \ +- %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER32 "}} \ +- %{static:-Bstatic}} \ +- %{symbolic:-Bsymbolic}" +- +-#define LINK_OS_FREEBSD_SPEC_DEF64 "\ ++#define LINK_OS_FREEBSD_SPEC_DEF "\ + %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ + %{v:-V} \ + %{assert*} %{R*} %{rpath*} %{defsym*} \ +@@ -177,13 +175,13 @@ + %{!shared: \ + %{!static: \ + %{rdynamic: -export-dynamic} \ +- %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER64 "}} \ ++ %{!dynamic-linker:-dynamic-linker " FBSD_DYNAMIC_LINKER "}} \ + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}" + +-#define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF32 ++#define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF + +-#define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF64 ++#define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF + + #undef MULTILIB_DEFAULTS + #define MULTILIB_DEFAULTS { "m64" } +@@ -304,7 +302,7 @@ + + /* rs6000.h gets this wrong for FreeBSD. We use the GCC defaults instead. */ + #undef WCHAR_TYPE +-#define WCHAR_TYPE (TARGET_64BIT ? "int" : "long int") ++ + #undef WCHAR_TYPE_SIZE + #define WCHAR_TYPE_SIZE 32 + |