diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 86a9eb94521..46f62b61aa5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-05  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* lib/target-supports.exp (check_effective_target_bswap): Update
+	conditions for AArch64 and ARM targets.
+
 2014-11-05  David Edelsohn  <dje.gcc@gmail.com>
 
 	* gcc.dg/torture/pr59166.c: XFAIL on AIX.
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index e5b04ec5f90..5a386415220 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -4864,15 +4864,24 @@ proc check_effective_target_bswap { } {
         verbose "check_effective_target_bswap: using cached result" 2
     } else {
 	set et_bswap_saved 0
-	if { [istarget aarch64-*-*]
+	if { [istarget aarch64*-*-*]
 	     || [istarget alpha*-*-*]
-	     || [istarget arm*-*-*]
 	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget m68k-*-*]
 	     || [istarget powerpc*-*-*]
 	     || [istarget rs6000-*-*]
 	     || [istarget s390*-*-*] } {
 	    set et_bswap_saved 1
+	} else {
+	    if { [istarget arm*-*-*]
+		 && [check_no_compiler_messages_nocache arm_v6_or_later object {
+		     #if __ARM_ARCH < 6
+		     #error not armv6 or later
+		     #endif
+		     int i;
+		 } ""] } {
+		set et_bswap_saved 1
+	    }
 	}
     }