target-supports.exp (check_effective_target_arm_nothumb): Also check for __arm__.

* lib/target-supports.exp (check_effective_target_arm_nothumb):
Also check for __arm__.

From-SVN: r212978

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2067bee..85df44f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-24  Andreas Schwab  <schwab@suse.de>
+
+       * lib/target-supports.exp (check_effective_target_arm_nothumb):
+       Also check for __arm__.
+
 2014-07-24  Jiong Wang  <jiong.wang@arm.com>
 
        * gcc.target/aarch64/test_frame_12.c: Match optimized instruction
@@ -33,7 +38,7 @@
 2014-07-23  Marek Polacek  <polacek@redhat.com>
 
        * c-c++-common/ubsan/bounds-2.c (fn4): Adjust to check the array size
-       in the structure. 
+       in the structure.
 
 2014-07-23  Jiong Wang  <jiong.wang@arm.com>
 

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index db65ebe..ade3cad 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -2262,7 +2262,7 @@ proc check_effective_target_aarch64_little_endian { } {
     }]
 }
 
-# Return 1 is this is an arm target using 32-bit instructions
+# Return 1 if this is an arm target using 32-bit instructions
 proc check_effective_target_arm32 { } {
     return [check_no_compiler_messages arm32 assembly {
        #if !defined(__arm__) || (defined(__thumb__) && !defined(__thumb2__))
@@ -2271,10 +2271,10 @@ proc check_effective_target_arm32 { } {
     }]
 }
 
-# Return 1 is this is an arm target not using Thumb
+# Return 1 if this is an arm target not using Thumb
 proc check_effective_target_arm_nothumb { } {
     return [check_no_compiler_messages arm_nothumb assembly {
-       #if (defined(__thumb__) || defined(__thumb2__))
+       #if !defined(__arm__) || (defined(__thumb__) || defined(__thumb2__))
        #error FOO
        #endif
     }]