From: Andreas Arnez <arnez@linux.vnet.ibm.com>
Date: Thu, 16 Apr 2015 11:03:48 +0000 (+0200)
Subject: s390-vregs.exp: Avoid compile errors with older GCCs and on 31-bit targets
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af9fd6f863c9f184e2c84d8a4707b3ec7b8ca67b;p=binutils-gdb.git

s390-vregs.exp: Avoid compile errors with older GCCs and on 31-bit targets

The test case s390-vregs.exp yields compile errors on 31-bit targets
as well as when using a GCC that defaults to an older "-march=".  This
patch fixes these issues.

gdb/testsuite/ChangeLog:

	* gdb.arch/s390-vregs.S (change_vrs): Replace exrl by an
	appropriate .insn, such that an older assembler can be used.
	* gdb.arch/s390-vregs.exp: Add the compile flag -mzarch, to enable
	the z/Architecture instruction set on 31-bit targets as well.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 55a593a58dc..0f2d552b916 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-16  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.arch/s390-vregs.S (change_vrs): Replace exrl by an
+	appropriate .insn, such that an older assembler can be used.
+	* gdb.arch/s390-vregs.exp: Add the compile flag -mzarch, to enable
+	the z/Architecture instruction set on 31-bit targets as well.
+
 2015-04-16  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* gdb.go/handcall.exp: Remove all logic related to the first
diff --git a/gdb/testsuite/gdb.arch/s390-vregs.S b/gdb/testsuite/gdb.arch/s390-vregs.S
index 4b48a836780..7388e7d3610 100644
--- a/gdb/testsuite/gdb.arch/s390-vregs.S
+++ b/gdb/testsuite/gdb.arch/s390-vregs.S
@@ -56,8 +56,8 @@ change_vrs:
 	.cfi_startproc
 	lghi	%r1,16
 	lghi	%r3,0xff
-1:	exrl	%r3,2f
-	exrl	%r3,1f
+1:	.insn	ril,0xc60000000000,%r3,2f /* exrl */
+	.insn	ril,0xc60000000000,%r3,1f /* exrl */
 	aghi	%r3,-0x11
 	brctg	%r1,1b
 	br	%r14
diff --git a/gdb/testsuite/gdb.arch/s390-vregs.exp b/gdb/testsuite/gdb.arch/s390-vregs.exp
index 8333c320794..7d3c9bb7d03 100644
--- a/gdb/testsuite/gdb.arch/s390-vregs.exp
+++ b/gdb/testsuite/gdb.arch/s390-vregs.exp
@@ -29,7 +29,8 @@ if [isnative] {
     remote_exec build "mkdir $coredir"
 }
 
-if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } {
+if { [prepare_for_testing ${testfile}.exp $testfile $srcfile \
+	  [list "additional_flags=-mzarch"]] } {
     return -1
 }