diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a22457a1406..9b6a2d9b7c04 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-11  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* lib/prune.exp (TEST_ALWAYS_FLAGS): If undefined, set to empty.
+
 2012-04-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR rtl-optimization/52876
diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index d2ba49e9db04..60a4bd4b994f 100644
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -17,6 +17,9 @@
 
 # Prune messages from gcc that aren't useful.
 
+if ![info exists TEST_ALWAYS_FLAGS] {
+    set TEST_ALWAYS_FLAGS ""
+}
 set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret $TEST_ALWAYS_FLAGS"
 
 proc prune_gcc_output { text } {
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 66321424d45b..bc6d5c477928 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-11  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* testsuite/lib/libgomp.exp: Add -fno-diagnostics-show-caret.
+
 2012-03-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR bootstrap/52812
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 02909f8f2d7f..cd561bf15766 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -161,6 +161,9 @@ proc libgomp_init { args } {
     # error-message parsing machinery.
     lappend ALWAYS_CFLAGS "additional_flags=-fmessage-length=0"
 
+    # Disable caret
+    lappend ALWAYS_CFLAGS "additional_flags=-fno-diagnostics-show-caret"
+
     # And, gee, turn on OpenMP.
     lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
 }