[src/trunk]: src/external/gpl3/gcc/dist/gcc/config revert previous

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

details:   https://anonhg.NetBSD.org/src/rev/df73669618db
branches:  trunk
changeset: 998212:df73669618db
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Apr 10 20:06:26 2019 +0000

description:
revert previous

diffstat:

 external/gpl3/gcc/dist/gcc/config/netbsd.h           |  10 ++++++++++
 external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h  |   1 +
 external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h |   6 ++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r af7b3a4b44ec -r df73669618db external/gpl3/gcc/dist/gcc/config/netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/netbsd.h        Wed Apr 10 19:36:04 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/netbsd.h        Wed Apr 10 20:06:26 2019 +0000
@@ -153,6 +153,16 @@
 #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
diff -r af7b3a4b44ec -r df73669618db external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
--- a/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h       Wed Apr 10 19:36:04 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h       Wed Apr 10 20:06:26 2019 +0000
@@ -89,6 +89,7 @@
 
 #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}}}}}}}}"
diff -r af7b3a4b44ec -r df73669618db external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
--- a/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h      Wed Apr 10 19:36:04 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h      Wed Apr 10 20:06:26 2019 +0000
@@ -142,7 +142,8 @@
     %{!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 @@
     %{!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 */