diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dad2c3c1fcf..10a7625da1a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2014-01-20  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* lib/target-supports.exp (force_conventional_output_for): New
+	procedure.
+	* lib/scanasm.exp (scan-assembler_required_options)
+	(scan-assembler-not_required_options)
+	(scan-assembler-times_required_options): Replace with
+	force_conventional_output_fors.
+	* lib/scanrtl.exp: Force conventional output for all rtl dump scans.
+	* gcc.target/mips/octeon-pipe-1.c: Remove -ffat-lto-objects.
+
 2014-01-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR middle-end/59789
diff --git a/gcc/testsuite/gcc.target/mips/octeon-pipe-1.c b/gcc/testsuite/gcc.target/mips/octeon-pipe-1.c
index 769ac9df17a..4488e3d5117 100644
--- a/gcc/testsuite/gcc.target/mips/octeon-pipe-1.c
+++ b/gcc/testsuite/gcc.target/mips/octeon-pipe-1.c
@@ -1,6 +1,6 @@
 /* Check that we use the octeon pipeline description.  */
 /* { dg-do compile } */
-/* { dg-options "-march=octeon -fschedule-insns2 -fdump-rtl-sched2 -ffat-lto-objects" } */
+/* { dg-options "-march=octeon -fschedule-insns2 -fdump-rtl-sched2" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 
 NOMIPS16 int f (int a, int b)
diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index 788f622a715..6e3e9d8fb67 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -82,10 +82,7 @@ proc scan-assembler { args } {
     dg-scan "scan-assembler" 1 $testcase $output_file $args
 }
 
-proc scan-assembler_required_options { args } {
-    global gcc_force_conventional_output
-    return $gcc_force_conventional_output
-}
+force_conventional_output_for scan-assembler
 
 # Check that a pattern is not present in the .s file produced by the
 # compiler.  See dg-scan for details.
@@ -97,10 +94,7 @@ proc scan-assembler-not { args } {
     dg-scan "scan-assembler-not" 0 $testcase $output_file $args
 }
 
-proc scan-assembler-not_required_options { args } {
-    global gcc_force_conventional_output
-    return $gcc_force_conventional_output
-}
+force_conventional_output_for scan-assembler-not
 
 # Return the scan for the assembly for hidden visibility. 
 
@@ -259,10 +253,7 @@ proc scan-assembler-times { args } {
     }
 }
 
-proc scan-assembler-times_required_options { args } {
-    global gcc_force_conventional_output
-    return $gcc_force_conventional_output
-}
+force_conventional_output_for scan-assembler-times
 
 # Utility for scanning demangled compiler result, invoked via dg-final.
 # Call pass if pattern is present, otherwise fail.
diff --git a/gcc/testsuite/lib/scanrtl.exp b/gcc/testsuite/lib/scanrtl.exp
index 28a4685b202..0507cc9138d 100644
--- a/gcc/testsuite/lib/scanrtl.exp
+++ b/gcc/testsuite/lib/scanrtl.exp
@@ -42,6 +42,8 @@ proc scan-rtl-dump { args } {
     }
 }
 
+force_conventional_output_for scan-rtl-dump
+
 # Call pass if pattern is present given number of times, otherwise fail.
 # Argument 0 is the regexp to match
 # Argument 1 is number of times the regexp must be found
@@ -66,6 +68,8 @@ proc scan-rtl-dump-times { args } {
     }
 }
 
+force_conventional_output_for scan-rtl-dump-times
+
 # Call pass if pattern is not present, otherwise fail.
 #
 # Argument 0 is the regexp to match
@@ -90,6 +94,8 @@ proc scan-rtl-dump-not { args } {
     }
 }
 
+force_conventional_output_for scan-rtl-dump-not
+
 # Utility for scanning demangled compiler result, invoked via dg-final.
 # Call pass if pattern is present, otherwise fail.
 #
@@ -115,6 +121,8 @@ proc scan-rtl-dump-dem { args } {
     }
 }
 
+force_conventional_output_for scan-rtl-dump-dem
+
 # Call pass if demangled pattern is not present, otherwise fail.
 #
 # Argument 0 is the regexp to match
@@ -139,3 +147,5 @@ proc scan-rtl-dump-dem-not { args } {
 			  "\[0-9\]\[0-9\]\[0-9\]r.[lindex $args 1]"
     }
 }
+
+force_conventional_output_for scan-rtl-dump-dem-not
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index eea0c2e238c..a8029c8477e 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -5667,3 +5667,17 @@ proc check_effective_target_fenv_exceptions {} {
 	}
     } "-std=gnu99"]
 }
+
+# Record that dg-final test TEST requires convential compilation.
+
+proc force_conventional_output_for { test } {
+    if { [info proc $test] == "" } {
+	perror "$test does not exist"
+	exit 1
+    }
+    proc ${test}_required_options {} {
+	global gcc_force_conventional_output
+	return $gcc_force_conventional_output
+    }
+}
+