Back port 2 upstream fixes for broken dejagnu tests.

upstream r156042 and r148110

Change-Id: Ic35d4be0fc74a4ae2b8c57a54affef975b79ed88

12 files changed, 12 insertions, 12 deletions

diff --git a/gcc-4.4.3/gcc/testsuite/g++.dg/init/ref15.C b/gcc-4.4.3/gcc/testsuite/g++.dg/init/ref15.C
index d3a94227f..bc9c01dc2 100644
--- a/gcc-4.4.3/gcc/testsuite/g++.dg/init/ref15.C
+++ b/gcc-4.4.3/gcc/testsuite/g++.dg/init/ref15.C
@@ -1,6 +1,8 @@
 // PR c++/20416.  We correctly constructed the temporary S in foo(),
 // but incorrectly destroyed it every time foo() was called.
-// { dg-do run }
+// When using a wrapped target, there is no way to override the exit
+// code after returning from main.
+// { dg-do run { target unwrapped } }
 extern "C" void abort (void);
 extern "C" void _exit (int);
 
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowf32.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowf32.c
index ae63430f7..a14a57636 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowf32.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowf32.c
@@ -9,7 +9,7 @@
 
 void test_vget_lowf32 (void)
 {
-  float32x2_t out_float32x2_t;
+  register float32x2_t out_float32x2_t asm ("d18");
   float32x4_t arg0_float32x4_t;
 
   out_float32x2_t = vget_low_f32 (arg0_float32x4_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp16.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp16.c
index c24ac0cf1..5c130f0b4 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp16.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp16.c
@@ -9,7 +9,7 @@
 
 void test_vget_lowp16 (void)
 {
-  poly16x4_t out_poly16x4_t;
+  register poly16x4_t out_poly16x4_t asm ("d18");
   poly16x8_t arg0_poly16x8_t;
 
   out_poly16x4_t = vget_low_p16 (arg0_poly16x8_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp8.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp8.c
index 45d65bcaf..4b4f599fc 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp8.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowp8.c
@@ -9,7 +9,7 @@
 
 void test_vget_lowp8 (void)
 {
-  poly8x8_t out_poly8x8_t;
+  register poly8x8_t out_poly8x8_t asm ("d18");
   poly8x16_t arg0_poly8x16_t;
 
   out_poly8x8_t = vget_low_p8 (arg0_poly8x16_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows16.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows16.c
index 8e6c29aa7..ee6e9904b 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows16.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows16.c
@@ -9,7 +9,7 @@
 
 void test_vget_lows16 (void)
 {
-  int16x4_t out_int16x4_t;
+  register int16x4_t out_int16x4_t asm ("d18");
   int16x8_t arg0_int16x8_t;
 
   out_int16x4_t = vget_low_s16 (arg0_int16x8_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows32.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows32.c
index e018afd7f..08315286d 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows32.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows32.c
@@ -9,7 +9,7 @@
 
 void test_vget_lows32 (void)
 {
-  int32x2_t out_int32x2_t;
+  register int32x2_t out_int32x2_t asm ("d18");
   int32x4_t arg0_int32x4_t;
 
   out_int32x2_t = vget_low_s32 (arg0_int32x4_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows64.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows64.c
index e2e2bd66f..9c1440ceb 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows64.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows64.c
@@ -15,5 +15,4 @@ void test_vget_lows64 (void)
   out_int64x1_t = vget_low_s64 (arg0_int64x2_t);
 }
 
-/* { dg-final { scan-assembler "vmov\[ 	\]+\[dD\]\[0-9\]+, \[dD\]\[0-9\]+!?\(\[ 	\]+@\[a-zA-Z0-9 \]+\)?\n" } } */
 /* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows8.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows8.c
index 0be24de35..7d324f337 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows8.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lows8.c
@@ -9,7 +9,7 @@
 
 void test_vget_lows8 (void)
 {
-  int8x8_t out_int8x8_t;
+  register int8x8_t out_int8x8_t asm ("d18");
   int8x16_t arg0_int8x16_t;
 
   out_int8x8_t = vget_low_s8 (arg0_int8x16_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu16.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu16.c
index 67bcd5090..b0c438453 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu16.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu16.c
@@ -9,7 +9,7 @@
 
 void test_vget_lowu16 (void)
 {
-  uint16x4_t out_uint16x4_t;
+  register uint16x4_t out_uint16x4_t asm ("d18");
   uint16x8_t arg0_uint16x8_t;
 
   out_uint16x4_t = vget_low_u16 (arg0_uint16x8_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu32.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu32.c
index d21d97acd..fdd8e79e9 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu32.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu32.c
@@ -9,7 +9,7 @@
 
 void test_vget_lowu32 (void)
 {
-  uint32x2_t out_uint32x2_t;
+  register uint32x2_t out_uint32x2_t asm ("d18");
   uint32x4_t arg0_uint32x4_t;
 
   out_uint32x2_t = vget_low_u32 (arg0_uint32x4_t);
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu64.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu64.c
index 79cf1c53d..e6f7627cb 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu64.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu64.c
@@ -15,5 +15,4 @@ void test_vget_lowu64 (void)
   out_uint64x1_t = vget_low_u64 (arg0_uint64x2_t);
 }
 
-/* { dg-final { scan-assembler "vmov\[ 	\]+\[dD\]\[0-9\]+, \[dD\]\[0-9\]+!?\(\[ 	\]+@\[a-zA-Z0-9 \]+\)?\n" } } */
 /* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu8.c b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu8.c
index 03996493c..d4e3c714d 100644
--- a/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu8.c
+++ b/gcc-4.4.3/gcc/testsuite/gcc.target/arm/neon/vget_lowu8.c
@@ -9,7 +9,7 @@
 
 void test_vget_lowu8 (void)
 {
-  uint8x8_t out_uint8x8_t;
+  register uint8x8_t out_uint8x8_t asm ("d18");
   uint8x16_t arg0_uint8x16_t;
 
   out_uint8x8_t = vget_low_u8 (arg0_uint8x16_t);