re PR testsuite/45361 (gcc.target/i386/volatile-2.c failed)

	PR testsuite/45361
	* gcc.target/i386/volatile-2.c: Update scan strings to also
	include (%rip) for the memory reference on x86_64.

From-SVN: r163416

2 files changed, 25 insertions, 22 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3580331..022db4c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-20  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR testsuite/45361
+	* gcc.target/i386/volatile-2.c: Update scan strings to also
+	include (%rip) for the memory reference on x86_64.
+
 2010-08-20  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/44974
@@ -22,11 +28,8 @@
 2010-08-19  Jason Merrill  <jason@redhat.com>
 
 	* g++.dg/init/synth3.C: New.
-
 	* g++.dg/init/value8.C: New.
-
 	* g++.dg/tree-ssa/empty-2.C: New.
-
 	* g++.dg/cpp0x/noexcept09.C: New.
 
 2010-08-19  Daniel Kraft  <d@domob.eu>
@@ -119,7 +122,7 @@
 	(check_effective_target_function_sections): New.
 	* gcc.dg/debug/dwarf2/aranges-fnsec-1.c: Check that the target supports
 	function sections before proceding.
-	
+
 2010-08-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR fortran/45308
diff --git a/gcc/testsuite/gcc.target/i386/volatile-2.c b/gcc/testsuite/gcc.target/i386/volatile-2.c
index 3f4d425..43851d1 100644
--- a/gcc/testsuite/gcc.target/i386/volatile-2.c
+++ b/gcc/testsuite/gcc.target/i386/volatile-2.c
@@ -10,8 +10,8 @@ extern int volatile obj_0;
 void test_0 (int data)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_0" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_0," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_0(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_0(\\(%rip\\))?," } } */
   obj_0 = data;
 }
 
@@ -19,8 +19,8 @@ extern int volatile obj_1;
 int test_1 (int data)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_1" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_1," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_1(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_1(\\(%rip\\))?," } } */
   return obj_1 = data;
 }
 
@@ -28,8 +28,8 @@ extern int volatile obj_2;
 int test_2 (void)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_2" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_2," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_2(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_2(\\(%rip\\))?," } } */
   return obj_2 = 0;
 }
 
@@ -40,8 +40,8 @@ extern int volatile obj_3;
 int test_3 (int data)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_3" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_3," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_3(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_3(\\(%rip\\))?," } } */
   return (obj_3 = data, 0);
 }
 
@@ -49,16 +49,16 @@ extern int volatile obj_4;
 int test_4 (void)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_4" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_4," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_4(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_4(\\(%rip\\))?," } } */
   return (obj_4 = 0, 0);
 }
 extern int volatile obj_5;
 int test_5 (void)
 {
   /* should reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_5" } } */
-  /* { dg-final { scan-assembler "movl\[ \t\]obj_5," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_5(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]obj_5(\\(%rip\\))?," } } */
   return (obj_5 = 0, obj_5);
 }
 
@@ -68,8 +68,8 @@ extern int volatile obj_6;
 void test_6 (int data, int cond)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_6" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_6," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_6(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_6(\\(%rip\\))?," } } */
   cond ? obj_6 = data : 0;
 }
 
@@ -77,8 +77,8 @@ extern int volatile obj_7;
 int test_7 (int data, int cond)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_7" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_7," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_7(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_7(\\(%rip\\))?," } } */
   return cond ? obj_7 = data : 0;
 }
 
@@ -86,7 +86,7 @@ extern int volatile obj_8;
 int test_8 (int cond)
 {
   /* should not reread obj */
-  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_8" } } */
-  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_8," } } */
+  /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_8(\\(%rip\\))?" } } */
+  /* { dg-final { scan-assembler-not "movl\[ \t\]obj_8(\\(%rip\\))?," } } */
   return cond ? obj_8 = 0 : 0;
 }