[src/trunk]: src/external/gpl3/gcc/dist/gcc fix powerpc64 bi-arch support: p...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8ebae93def71
branches:  trunk
changeset: 830034:8ebae93def71
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Feb 22 22:20:44 2018 +0000

description:
fix powerpc64 bi-arch support:  provide a LINK_SECURE_PLT_SPEC.
with this, and mknative-gcc for it, powerpc64 builds with GCC 6.

diffstat:

 external/gpl3/gcc/dist/gcc/config.gcc               |  4 +---
 external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h |  4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 53848a7b5d9e -r 8ebae93def71 external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Thu Feb 22 14:57:11 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Thu Feb 22 22:20:44 2018 +0000
@@ -2499,9 +2499,7 @@
        tm_file="${tm_file} netbsd.h netbsd-elf.h"
        case ${target} in
            powerpc64*)
-               # ends up enabling --secure-plt on 64 bit, which isn't good.
-               #tm_file="rs6000/biarch64.h ${tm_file}"
-               enable_secureplt=no
+               tm_file="rs6000/biarch64.h ${tm_file}"
                tm_file="${tm_file} rs6000/sysv4.h rs6000/default64.h rs6000/netbsd64.h"
                tmake_file="${tmake_file} rs6000/t-netbsd64"
                ;;
diff -r 53848a7b5d9e -r 8ebae93def71 external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
--- a/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h       Thu Feb 22 14:57:11 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h       Thu Feb 22 22:20:44 2018 +0000
@@ -188,20 +188,24 @@
 #undef ASM_DEFAULT_SPEC
 #undef ASM_SPEC
 #undef LINK_OS_NETBSD_SPEC
+#undef LINK_SECURE_PLT_SPEC
 
 #ifndef        RS6000_BI_ARCH
 #define        ASM_DEFAULT_SPEC "-mppc64"
 #define        ASM_SPEC         "%(asm_spec64) %(asm_spec_common)"
 #define        LINK_OS_NETBSD_SPEC "%(link_os_netbsd_spec64)"
+#define        LINK_SECURE_PLT_SPEC ""
 #else
 #if DEFAULT_ARCH64_P
 #define        ASM_DEFAULT_SPEC "-mppc%{!m32:64}"
 #define        ASM_SPEC         "%{m32:%(asm_spec32)}%{!m32:%(asm_spec64)} %(asm_spec_common)"
 #define        LINK_OS_NETBSD_SPEC "%{m32:%(link_os_netbsd_spec32)}%{!m32:%(link_os_netbsd_spec64)}"
+#define        LINK_SECURE_PLT_SPEC "%{m32: " LINK_SECURE_PLT_DEFAULT_SPEC "}"
 #else
 #define        ASM_DEFAULT_SPEC "-mppc%{m64:64}"
 #define        ASM_SPEC         "%{!m64:%(asm_spec32)}%{m64:%(asm_spec64)} %(asm_spec_common)"
 #define        LINK_OS_NETBSD_SPEC "%{!m64:%(link_os_netbsd_spec32)}%{m64:%(link_os_netbsd_spec64)}"
+#define        LINK_SECURE_PLT_SPEC "%{!m64: " LINK_SECURE_PLT_DEFAULT_SPEC "}"
 #endif
 #endif