4 files changed, 13 insertions, 12 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e0f4441..11c7de2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-26  Andreas Tobler  <andreast@gcc.gnu.org>
+
+        * g++.old-deja/g++.jason/enum6.C: Use arm_eabi for dg-options.
+        Update comment.
+        * g++.old-deja/g++.law/enum9.C: Likewise.
+        * g++.old-deja/g++.other/enum4.C: Likewise.
+
 2014-11-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/63534
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/enum6.C b/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
index 97bc2ba..c5bcec9 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
@@ -7,10 +7,8 @@
 // enum-size attributes should only be emitted if there are values of
 // enum type that can escape the compilation unit, gcc cannot currently
 // detect this; if this facility is added then this linker option should
-// not be needed.  arm-*-linux* should be a good approximation to
-// those platforms where the EABI supplement defines enum values to be
-// 32 bits wide.
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } }
+// not be needed.
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm_eabi } }
 
 #include <limits.h>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/enum9.C b/gcc/testsuite/g++.old-deja/g++.law/enum9.C
index e4045b5..a1a551d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/enum9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/enum9.C
@@ -7,10 +7,8 @@
 // enum-size attributes should only be emitted if there are values of
 // enum type that can escape the compilation unit, gcc cannot currently
 // detect this; if this facility is added then this linker option should
-// not be needed.  arm-*-linux* should be a good approximation to
-// those platforms where the EABI supplement defines enum values to be
-// 32 bits wide.
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } }
+// not be needed.
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm_eabi } }
 
 // GROUPS passed enums
   extern "C" int printf (const char *, ...);
diff --git a/gcc/testsuite/g++.old-deja/g++.other/enum4.C b/gcc/testsuite/g++.old-deja/g++.other/enum4.C
index 3c8bb0c..3cda57c 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/enum4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/enum4.C
@@ -9,10 +9,8 @@
 // enum-size attributes should only be emitted if there are values of
 // enum type that can escape the compilation unit, gcc cannot currently
 // detect this; if this facility is added then this linker option should
-// not be needed.  arm-*-linux* should be a good approximation to
-// those platforms where the EABI supplement defines enum values to be
-// 32 bits wide.
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } }
+// not be needed.
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm_eabi } }
 
 enum E { 
   a = -312