Module Name: src Committed By: maya Date: Wed Apr 10 20:06:26 UTC 2019
Modified Files: src/external/gpl3/gcc/dist/gcc/config: netbsd.h src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd64.h src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h Log Message: revert previous To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/external/gpl3/gcc/dist/gcc/config/netbsd.h cvs rdiff -u -r1.20 -r1.21 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h cvs rdiff -u -r1.14 -r1.15 \ src/external/gpl3/gcc/dist/gcc/config/sparc/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.h diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.29 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.30 --- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.29 Wed Apr 10 16:11:06 2019 +++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Wed Apr 10 20:06:26 2019 @@ -153,6 +153,16 @@ along with GCC; see the file COPYING3. #define NETBSD_LIBGCC_SPEC "-lgcc" #endif +/* Pass -cxx-isystem to cc1/cc1plus. */ +#define NETBSD_CC1_AND_CC1PLUS_SPEC \ + "%{cxx-isystem}" + +#undef CC1_SPEC +#define CC1_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC + +#undef CC1PLUS_SPEC +#define CC1PLUS_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC + #if defined(HAVE_LD_EH_FRAME_HDR) #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " #endif Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.20 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.21 --- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.20 Wed Apr 10 16:15:11 2019 +++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Wed Apr 10 20:06:26 2019 @@ -89,6 +89,7 @@ extern int dot_symbols; #undef CC1_OS_NETBSD_SPEC #define CC1_OS_NETBSD_SPEC \ + NETBSD_CC1_AND_CC1PLUS_SPEC \ "%{!m32: %{!mrelocatable: %{!fno-pie: %{!fno-pic: \ %{!fpie: %{!fpic: \ %{!fPIE: %{!fPIC:-fPIC}}}}}}}}" 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.14 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.15 --- src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.14 Wed Apr 10 16:15:11 2019 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h Wed Apr 10 20:06:26 2019 @@ -142,7 +142,8 @@ along with GCC; see the file COPYING3. %{!mcpu*:%{!mv8plus:-mcpu=ultrasparc}} \ %{!mno-vis:%{!mcpu=v9:-mvis}} \ %{p:-mcmodel=medlow} \ - %{pg:-mcmodel=medlow}} " + %{pg:-mcmodel=medlow}} " \ + NETBSD_CC1_AND_CC1PLUS_SPEC #define CC1_SPEC64 \ "%{m32:%{m64:%emay not use both -m32 and -m64}} \ @@ -152,7 +153,8 @@ along with GCC; see the file COPYING3. %{!mcpu*:%{!mv8plus:-mcpu=cypress}}} \ %{!m32: \ %{p:-mcmodel=medlow} \ - %{pg:-mcmodel=medlow}} " + %{pg:-mcmodel=medlow}} " \ + NETBSD_CC1_AND_CC1PLUS_SPEC #if defined(SPARC_BI_ARCH) || defined(__arch64__) /* add code model specific object to the link line for 64bit */