From b418cc876926be9532aa8ea868186aa92ed462a0 Mon Sep 17 00:00:00 2001
From: synergydev <synergye@codefi.re>
Date: Thu, 8 Aug 2013 04:40:50 -0700
Subject: [4.8] Backport diagnostic color support from trunk

Squashed commit of r197841, r197842, and r198332 from trunk.

This is capable of coloring errors, warnings, notes, carets, locus', and/or quotes.
Documentation for this feature may be found here:
http://gcc.gnu.org/onlinedocs/gcc/Language-Independent-Options.html

Change-Id: I14f2f852562d18fcef807583635e4e2ceee64829
---
 gcc-4.8/gcc/testsuite/lib/c-compat.exp | 11 ++++++++++-
 gcc-4.8/gcc/testsuite/lib/prune.exp    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'gcc-4.8/gcc/testsuite')

diff --git a/gcc-4.8/gcc/testsuite/lib/c-compat.exp b/gcc-4.8/gcc/testsuite/lib/c-compat.exp
index 58eaf4d64..b42545dfa 100644
--- a/gcc-4.8/gcc/testsuite/lib/c-compat.exp
+++ b/gcc-4.8/gcc/testsuite/lib/c-compat.exp
@@ -34,7 +34,7 @@ load_lib target-supports.exp
 # 
 proc compat-use-alt-compiler { } {
     global GCC_UNDER_TEST ALT_CC_UNDER_TEST
-    global compat_same_alt compat_alt_caret
+    global compat_same_alt compat_alt_caret compat_alt_color
     global TEST_ALWAYS_FLAGS
 
     # We don't need to do this if the alternate compiler is actually
@@ -44,6 +44,9 @@ proc compat-use-alt-compiler { } {
 	if { $compat_alt_caret == 0 } then {
 	    regsub -- "-fno-diagnostics-show-caret" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS
 	}
+	if { $compat_alt_color == 0 } then {
+	    regsub -- "-fdiagnostics-color=never" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS
+	}
     }
 }
 
@@ -70,9 +73,11 @@ proc compat_setup_dfp { } {
     global compat_same_alt
     global compat_have_dfp
     global compat_alt_caret
+    global compat_alt_color
     global TEST_ALWAYS_FLAGS compat_save_TEST_ALWAYS_FLAGS
 
     set compat_alt_caret 0
+    set compat_alt_color 0
     set compat_save_TEST_ALWAYS_FLAGS $TEST_ALWAYS_FLAGS
 
     verbose "compat_setup_dfp: $compat_use_alt $compat_same_alt" 2
@@ -88,6 +93,10 @@ proc compat_setup_dfp { } {
 		int dummy; } "-fno-diagnostics-show-caret"] != 0 } {
 	    set compat_alt_caret 1
 	}
+	if { [check_no_compiler_messages_nocache compat_alt_has_color object {
+		int dummy; } "-fdiagnostics-color=never"] != 0 } {
+	    set compat_alt_color 1
+	}
 	compat-use-tst-compiler
     }
 
diff --git a/gcc-4.8/gcc/testsuite/lib/prune.exp b/gcc-4.8/gcc/testsuite/lib/prune.exp
index c110fc605..789060865 100644
--- a/gcc-4.8/gcc/testsuite/lib/prune.exp
+++ b/gcc-4.8/gcc/testsuite/lib/prune.exp
@@ -19,7 +19,7 @@
 if ![info exists TEST_ALWAYS_FLAGS] {
     set TEST_ALWAYS_FLAGS ""
 }
-set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret $TEST_ALWAYS_FLAGS"
+set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret -fdiagnostics-color=never $TEST_ALWAYS_FLAGS"
 
 proc prune_gcc_output { text } {
     #send_user "Before:$text\n"
-- 
cgit v1.2.3