Module Name:    src
Committed By:   mrg
Date:           Thu Apr 11 00:17:44 UTC 2019

Modified Files:
        src/external/gpl3/gcc/dist/gcc/config/i386: netbsd-elf.h netbsd64.h

Log Message:
be sure to keep cc1_cpu the CC1*_SPEC.

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
    src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h \
    src/external/gpl3/gcc/dist/gcc/config/i386/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/i386/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.10 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.10	Sat Jan 19 12:10:06 2019
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h	Thu Apr 11 00:17:44 2019
@@ -41,6 +41,16 @@ along with GCC; see the file COPYING3.  
 #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
Index: src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.10 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.10	Sat Jan 19 12:10:06 2019
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h	Thu Apr 11 00:17:44 2019
@@ -44,6 +44,16 @@ along with GCC; see the file COPYING3.  
 #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

Reply via email to