Module Name:    src
Committed By:   mrg
Date:           Thu Feb 22 22:20:44 UTC 2018

Modified Files:
        src/external/gpl3/gcc/dist/gcc: config.gcc
        src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd64.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.14 -r1.15 \
    src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.39 src/external/gpl3/gcc/dist/gcc/config.gcc:1.40
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.39	Wed Feb  7 05:34:21 2018
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Thu Feb 22 22:20:44 2018
@@ -2499,9 +2499,7 @@ powerpc*-*-netbsd*)
 	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"
 		;;

Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.14 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.14	Thu Jun  9 23:28:22 2016
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h	Thu Feb 22 22:20:44 2018
@@ -188,20 +188,24 @@ extern int dot_symbols;
 #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
 

Reply via email to