Module Name:    src
Committed By:   mrg
Date:           Sat Mar 26 09:02:58 UTC 2016

Modified Files:
        src/external/gpl3/gcc/usr.bin/gcc/arch/alpha: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/arm: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/armeb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earm: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/hppa: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/i386: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/m68000: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/m68k: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/sparc: auto-host.h configargs.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64: auto-host.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: auto-host.h
        src/tools/gcc: Makefile

Log Message:
use --with-diagnostics-color=auto-if-env as the default for GCC 5.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h
cvs rdiff -u -r1.9 -r1.10 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire/auto-host.h
cvs rdiff -u -r1.9 -r1.10 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/auto-host.h
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/auto-host.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/auto-host.h
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h
cvs rdiff -u -r1.20 -r1.21 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h
cvs rdiff -u -r1.9 -r1.10 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h
cvs rdiff -u -r1.79 -r1.80 src/tools/gcc/Makefile

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/usr.bin/gcc/arch/alpha/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h:1.6	Fri Mar 18 07:29:41 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h:1.6	Thu Mar 17 08:09:36 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h:1.9 src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h:1.10
--- src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h:1.9	Thu Mar 17 23:40:16 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire/auto-host.h:1.6	Tue Mar 22 10:09:01 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h:1.9 src/external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h:1.10
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h:1.9	Thu Mar 17 23:40:16 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h:1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h:1.8
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h:1.7	Thu Mar 17 23:40:16 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h:1.8	Thu Mar 17 23:40:16 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h:1.6	Thu Mar 17 23:40:16 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h:1.6	Thu Mar 17 23:40:16 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h:1.6	Thu Mar 17 23:40:16 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h	Sat Mar 26 09:02:56 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h:1.6	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h:1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h:1.8
--- src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h:1.7	Sun Mar 20 21:14:21 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h:1.8	Wed Mar 16 10:56:20 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h:1.8	Tue Mar 22 08:15:25 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/auto-host.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/auto-host.h:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/auto-host.h:1.8	Tue Mar 22 08:15:25 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h:1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h:1.8
--- src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h:1.7	Tue Mar 22 06:54:19 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h	Sat Mar 26 09:02:57 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/auto-host.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/auto-host.h:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/auto-host.h:1.8	Tue Mar 22 06:54:19 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h:1.8	Tue Mar 22 05:09:49 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h:1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h:1.8
--- src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h:1.7	Tue Mar 22 04:50:50 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h:1.6	Fri Mar 18 07:29:41 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/auto-host.h:1.6	Fri Mar 18 09:18:07 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h:1.6	Fri Mar 18 09:18:07 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h:1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h:1.8
--- src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h:1.7	Thu Mar 17 23:40:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h:1.20 src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h:1.21
--- src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h:1.20	Fri Mar 18 01:03:36 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h	Sat Mar 26 09:02:58 2016
@@ -3,7 +3,7 @@
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* Generated automatically. */
-static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=sparc--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20160317' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/sparc --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=sparc--netbsdelf --with-sysroot=/var/obj/mknative/sparc/usr/src/destdir.sparc";
+static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=sparc--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20160317' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/sparc --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=sparc--netbsdelf --with-sysroot=/var/obj/mknative/sparc/usr/src/destdir.sparc : (reconfigured) /usr/src/tools
 /gcc/../../external/gpl3/gcc/dist/configure --target=sparc--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20160317' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-time=rt --enable-libstdcxx-threads --with-diagnostics-color=auto-if-env --with-mpc-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/sparc/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/sparc --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=sparc--netbsdelf --with-sysroot=/var/obj/mknative/sparc/usr/src/destdir.sparc";
 static const char thread_model[] = "posix";
 
 static const struct {

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h:1.8	Wed Mar 16 18:07:17 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h:1.9 src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h:1.10
--- src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h:1.9	Thu Mar 17 08:09:38 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h	Sat Mar 26 09:02:58 2016
@@ -64,7 +64,7 @@
 
 /* The default for -fdiagnostics-color option */
 #ifndef USED_FOR_TARGET
-#define DIAGNOSTICS_COLOR_DEFAULT DIAGNOSTICS_COLOR_AUTO
+#define DIAGNOSTICS_COLOR_DEFAULT -1
 #endif
 
 

Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.79 src/tools/gcc/Makefile:1.80
--- src/tools/gcc/Makefile:1.79	Wed Mar 16 05:47:43 2016
+++ src/tools/gcc/Makefile	Sat Mar 26 09:02:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.79 2016/03/16 05:47:43 mrg Exp $
+#	$NetBSD: Makefile,v 1.80 2016/03/26 09:02:56 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -36,6 +36,7 @@ COMMON_CONFIGURE_ARGS=	--target=${MACHIN
 			--with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
 			--with-system-zlib \
 			--enable-__cxa_atexit \
+			--enable-libstdcxx-time=rt \
 			--enable-libstdcxx-threads
 .if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
 COMMON_CONFIGURE_ARGS+=	--with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
@@ -45,11 +46,12 @@ COMMON_CONFIGURE_ARGS+=	--with-tune=${GC
 .endif
 
 .if ${HAVE_GCC} == 48
-COMMON_CONFIGURE_ARGS+= --enable-libstdcxx-time=rt --enable-lto
+COMMON_CONFIGURE_ARGS+= --enable-lto
 .endif
 
 .if ${HAVE_GCC} == 53
-COMMON_CONFIGURE_ARGS+= --enable-libstdcxx-time=rt
+# Turn on colour output only if GCC_COLORS env is set
+COMMON_CONFIGURE_ARGS+= --with-diagnostics-color=auto-if-env
 .endif
 
 CONFIGURE_ARGS=	${COMMON_CONFIGURE_ARGS}

Reply via email to