[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/i386 be sure to keep cc1_c...

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

details:   https://anonhg.NetBSD.org/src/rev/2bfe1bd23aa0
branches:  trunk
changeset: 998220:2bfe1bd23aa0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Apr 11 00:17:44 2019 +0000

description:
be sure to keep cc1_cpu the CC1*_SPEC.

fixes x86 -mtune=native without killing -cxx-isystem.

diffstat:

 external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h |  10 ++++++++++
 external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h   |  10 ++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

diffs (40 lines):

diff -r 6f27337c2cfc -r 2bfe1bd23aa0 external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h
--- a/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h       Wed Apr 10 23:30:28 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h       Thu Apr 11 00:17:44 2019 +0000
@@ -41,6 +41,16 @@
 #define CPP_SPEC "%(netbsd_cpp_spec)"
 
 
+/* Provide C11_SPEC/CC1PLUS_SPEC appropriate for NetBSD/i386.  */
+#define NETBSD_CC1_CPU_SPEC " %(cc1_cpu) "
+
+#undef CC1_SPEC
+#define CC1_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC NETBSD_CC1_CPU_SPEC
+
+#undef CC1PLUS_SPEC
+#define CC1PLUS_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC NETBSD_CC1_CPU_SPEC
+
+
 /* Make gcc agree with <machine/ansi.h> */
 
 #undef SIZE_TYPE
diff -r 6f27337c2cfc -r 2bfe1bd23aa0 external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h
--- a/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h Wed Apr 10 23:30:28 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h Thu Apr 11 00:17:44 2019 +0000
@@ -44,6 +44,16 @@
 #define CPP_SPEC "%(netbsd_cpp_spec)"
 
 
+/* Provide C11_SPEC/CC1PLUS_SPEC appropriate for NetBSD/x86-64.  */
+#define NETBSD_CC1_CPU_SPEC " %(cc1_cpu) "
+
+#undef CC1_SPEC
+#define CC1_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC NETBSD_CC1_CPU_SPEC
+
+#undef CC1PLUS_SPEC
+#define CC1PLUS_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC NETBSD_CC1_CPU_SPEC
+
+
 /* Output assembler code to FILE to call the profiler.  */
 
 #undef FUNCTION_PROFILER