Module Name: src
Committed By: mrg
Date: Fri Aug 19 05:11:10 UTC 2016
Modified Files:
src/external/gpl3/gcc/dist/gcc/config: netbsd-elf.h
src/external/gpl3/gcc/dist/gcc/config/alpha: netbsd.h
src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h netbsd-elf.h
src/external/gpl3/gcc/dist/gcc/config/i386: netbsd-elf.h netbsd64.h
src/external/gpl3/gcc/dist/gcc/config/ia64: netbsd.h
src/external/gpl3/gcc/dist/gcc/config/m68k: netbsd-elf.h
src/external/gpl3/gcc/dist/gcc/config/mips: netbsd.h
src/external/gpl3/gcc/dist/gcc/config/or1k: netbsd.h
src/external/gpl3/gcc/dist/gcc/config/pa: pa-netbsd.h
src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h
src/external/gpl3/gcc/dist/gcc/config/sh: netbsd-elf.h
src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h
src/external/gpl3/gcc/dist/gcc/config/vax: netbsd-elf.h
Log Message:
canonicalise the netbsd spec functions in NETBSD_SUBTARGET_EXTRA_SPECS:
netbsd_cpp_spec
netbsd_link_spec
netbsd_entry_point
netbsd_endfile_spec
use this in all netbsd targets.
XXX: 3 ports set this to EXTRA_SPECS instead of SUBTARGET_EXTRA_SPECS.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/alpha/netbsd.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h \
src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/sh/netbsd-elf.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/gcc/config/vax/netbsd-elf.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/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h:1.9 src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h:1.10
--- src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h:1.9 Wed Jun 1 22:27:49 2016
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h Fri Aug 19 05:11:09 2016
@@ -90,6 +90,17 @@ along with GCC; see the file COPYING3.
%{%:sanitize(address): -lasan } \
%{%:sanitize(undefined): -lubsan}}}"
+/* Provide the standard list of subtarget extra specs for NetBSD targets. */
+#define NETBSD_SUBTARGET_EXTRA_SPECS \
+ { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
+ { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
+ { "netbsd_entry_point", NETBSD_ENTRY_POINT }, \
+ { "netbsd_endfile_spec", NETBSD_ENDFILE_SPEC },
+
+#undef SUBTARGET_EXTRA_SPECS
+#define SUBTARGET_EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS
+
+
/* Use --as-needed -lgcc_s for eh support. */
#ifdef HAVE_LD_AS_NEEDED
#define USE_LD_AS_NEEDED 1
Index: src/external/gpl3/gcc/dist/gcc/config/alpha/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/alpha/netbsd.h:1.4 src/external/gpl3/gcc/dist/gcc/config/alpha/netbsd.h:1.5
--- src/external/gpl3/gcc/dist/gcc/config/alpha/netbsd.h:1.4 Sun Jan 24 09:43:32 2016
+++ src/external/gpl3/gcc/dist/gcc/config/alpha/netbsd.h Fri Aug 19 05:11:09 2016
@@ -41,11 +41,8 @@ along with GCC; see the file COPYING3.
#define CPP_SPEC NETBSD_CPP_SPEC
#undef EXTRA_SPECS
-#define EXTRA_SPECS \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT }, \
- { "netbsd_endfile_spec", NETBSD_ENDFILE_SPEC },
-
+#define EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS
+#undef SUBTARGET_EXTRA_SPECS
/* Provide a LINK_SPEC appropriate for a NetBSD/alpha ELF target. */
Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.14 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.14 Wed May 27 15:33:41 2015
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h Fri Aug 19 05:11:09 2016
@@ -93,14 +93,13 @@
#define SUBTARGET_EXTRA_SPECS \
{ "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \
{ "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
{ "linker_eabi_suffix", TARGET_LINKER_EABI_SUFFIX }, \
{ "linker_emulation", TARGET_LINKER_EMULATION }, \
{ "linker_big_emulation", TARGET_LINKER_BIG_EMULATION }, \
{ "linker_little_emulation", TARGET_LINKER_LITTLE_EMULATION }, \
{ "be8_link_spec", BE8_LINK_SPEC }, \
{ "target_fix_v4bx_spec", TARGET_FIX_V4BX_SPEC }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
+ NETBSD_SUBTARGET_EXTRA_SPECS
#define NETBSD_ENTRY_POINT "__start"
Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.10 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.10 Fri Jun 10 01:14:00 2016
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h Fri Aug 19 05:11:09 2016
@@ -75,13 +75,6 @@
"%{mhard-float:%{!mfpu=*:-mfpu=vfp}} \
%{mfloat-abi=hard:%{!mfpu=*:-mfpu=vfp}}"
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \
- { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
-
#define NETBSD_ENTRY_POINT "__start"
#undef LINK_SPEC
Index: src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.6 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.7
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.6 Sun Jan 24 09:43:33 2016
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h Fri Aug 19 05:11:09 2016
@@ -27,14 +27,6 @@ along with GCC; see the file COPYING3.
while (0)
-/* Extra specs needed for NetBSD/i386 ELF. */
-
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
-
-
/* Provide a LINK_SPEC appropriate for a NetBSD/i386 ELF target. */
#undef LINK_SPEC
Index: src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.6 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.7
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.6 Sun Mar 27 17:17:59 2016
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h Fri Aug 19 05:11:09 2016
@@ -27,15 +27,6 @@ along with GCC; see the file COPYING3.
while (0)
-/* Extra specs needed for NetBSD/x86-64 ELF. */
-
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
-
-
/* Provide a LINK_SPEC appropriate for a NetBSD/x86-64 ELF target. */
#undef LINK_SPEC
Index: src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h:1.5 src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h:1.6
--- src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h:1.5 Fri Jul 1 14:48:51 2016
+++ src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h Fri Aug 19 05:11:09 2016
@@ -27,15 +27,6 @@ Boston, MA 02111-1307, USA. */
while (0)
-/* Extra specs needed for NetBSD/ia-64 ELF. */
-
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
-
-
/* Provide a LINK_SPEC appropriate for a NetBSD/ia64 ELF target. */
#undef LINK_SPEC
Index: src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.9 src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.10
--- src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.9 Sun Jun 26 15:46:42 2016
+++ src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h Fri Aug 19 05:11:10 2016
@@ -53,11 +53,6 @@ along with GCC; see the file COPYING3.
} \
}
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
-
/* Provide a CPP_SPEC appropriate for NetBSD m68k targets. Currently we
deal with the GCC option '-posix', as well as an indication as to
Index: src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h:1.7 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h:1.8
--- src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h:1.7 Sun Jan 24 09:43:33 2016
+++ src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h Fri Aug 19 05:11:10 2016
@@ -158,13 +158,6 @@ along with GCC; see the file COPYING3.
while (0)
-/* Extra specs we need. */
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
-
/* Provide a SUBTARGET_CPP_SPEC appropriate for NetBSD. */
#undef SUBTARGET_CPP_SPEC
Index: src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h:1.2 src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h:1.2 Fri Sep 19 00:24:28 2014
+++ src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h Fri Aug 19 05:11:10 2016
@@ -54,12 +54,6 @@ Boston, MA 02111-1307, USA. */
#undef NETBSD_ENTRY_POINT
#define NETBSD_ENTRY_POINT "_start"
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT }, \
- { "netbsd_endfile_spec", NETBSD_ENDFILE_SPEC },
-
#undef TARGET_DEFAULT
#define TARGET_DEFAULT \
(/*MASK_HARD_FLOAT |*/ MASK_DOUBLE_FLOAT \
Index: src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h:1.4 src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h:1.5
--- src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h:1.4 Mon Mar 14 07:33:27 2016
+++ src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h Fri Aug 19 05:11:10 2016
@@ -35,8 +35,8 @@ along with GCC; see the file COPYING3.
"%{v:-V} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}"
#undef EXTRA_SPECS
-#define EXTRA_SPECS \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
+#define EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS
+#undef SUBTARGET_EXTRA_SPECS
#define NETBSD_ENTRY_POINT "__start"
Index: src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.3 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.4
--- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.3 Wed Apr 1 06:35:01 2015
+++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Fri Aug 19 05:11:10 2016
@@ -63,12 +63,6 @@ Boston, MA 02111-1307, USA. */
#undef NETBSD_ENTRY_POINT
#define NETBSD_ENTRY_POINT "_start"
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT }, \
- { "netbsd_endfile_spec", NETBSD_ENDFILE_SPEC },
-
#define SIG_ATOMIC_TYPE "int"
#define INT8_TYPE "signed char"
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.10 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.10 Sun Jan 24 09:43:33 2016
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h Fri Aug 19 05:11:10 2016
@@ -112,9 +112,7 @@
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT }, \
- { "netbsd_endfile_spec", NETBSD_ENDFILE_SPEC },
+ NETBSD_SUBTARGET_EXTRA_SPECS
/*
* Add NetBSD specific defaults: -mstrict-align
Index: src/external/gpl3/gcc/dist/gcc/config/sh/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/sh/netbsd-elf.h:1.1.1.3 src/external/gpl3/gcc/dist/gcc/config/sh/netbsd-elf.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/sh/netbsd-elf.h:1.1.1.3 Sun Jan 24 06:06:25 2016
+++ src/external/gpl3/gcc/dist/gcc/config/sh/netbsd-elf.h Fri Aug 19 05:11:10 2016
@@ -20,13 +20,6 @@ along with GCC; see the file COPYING3.
/* Run-time Target Specification. */
-/* Extra specs needed for NetBSD SuperH ELF targets. */
-
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
-
-
#define TARGET_OS_CPP_BUILTINS() \
do \
{ \
Index: src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.10 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.10 Sun Jan 24 09:43:34 2016
+++ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h Fri Aug 19 05:11:10 2016
@@ -209,9 +209,7 @@ along with GCC; see the file COPYING3.
{ "link_arch64", LINK_ARCH64_SPEC }, \
{ "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
{ "link_arch", LINK_ARCH_SPEC }, \
- { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
- { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
+ NETBSD_SUBTARGET_EXTRA_SPECS
/* Build a compiler that supports -m32 and -m64? */
Index: src/external/gpl3/gcc/dist/gcc/config/vax/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/netbsd-elf.h:1.3 src/external/gpl3/gcc/dist/gcc/config/vax/netbsd-elf.h:1.4
--- src/external/gpl3/gcc/dist/gcc/config/vax/netbsd-elf.h:1.3 Sun Jan 24 09:43:34 2016
+++ src/external/gpl3/gcc/dist/gcc/config/vax/netbsd-elf.h Fri Aug 19 05:11:10 2016
@@ -43,25 +43,11 @@ along with GCC; see the file COPYING3.
#define NETBSD_ENTRY_POINT "__start"
#undef LINK_SPEC
-#if 0
-/* FIXME: We must link all executables statically until PIC support
- is added to the compiler. */
-#define LINK_SPEC \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:%ethe -shared option is not currently supported for VAX ELF} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
- %{!r: \
- %{!e*:-e %(netbsd_entry_point)}}} \
- %{!static:-static} \
- %{static:-static}}"
-#else
#define LINK_SPEC NETBSD_LINK_SPEC_ELF
-#endif
-#define EXTRA_SPECS \
- { "netbsd_entry_point", NETBSD_ENTRY_POINT },
+#undef EXTRA_SPECS
+#define EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS
+#undef SUBTARGET_EXTRA_SPECS
#undef INTPTR_TYPE
#define INTPTR_TYPE "long int"
