diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5532ed19495eec4551f5b13420fcf9f72c73c436..e89bca598d643d1d795266bbf3b21c20ab7ad77f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-30  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* lib/target-supports.exp (check_effective_target_freorder): Check
+	additional case.
+
 2016-11-30  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gcc.target/arc/arc700-stld-hazard.c: New file.
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 2192eb6539b12896816f8844e056f3bf5016e4d9..ace080e9c471f8ce66ae76294747f57221d7e03b 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1011,12 +1011,19 @@ proc check_effective_target_fstack_protector {} {
 }
 
 # Return 1 if compilation with -freorder-blocks-and-partition is error-free
-# for trivial code, 0 otherwise.
+# for trivial code, 0 otherwise.  As some targets (ARM for example) only
+# warn when -fprofile-use is also supplied we test that combination too.
 
 proc check_effective_target_freorder {} {
-    return [check_no_compiler_messages freorder object {
+    if { [check_no_compiler_messages freorder object {
 	void foo (void) { }
     } "-freorder-blocks-and-partition"]
+    && [check_no_compiler_messages fprofile_use_freorder object {
+	void foo (void) { }
+    } "-fprofile-use -freorder-blocks-and-partition"] } {
+	return 1
+    }
+    return 0
 }
 
 # Return 1 if -fpic and -fPIC are supported, as in no warnings or errors