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

login
register
mail settings
Submitter Andreas Arnez
Date April 8, 2015, 4:29 p.m.
Message ID <87pp7eshw3.fsf@br87z6lw.de.ibm.com>
Download mbox | patch
Permalink /patch/6087/
State New
Headers show

Comments

Andreas Arnez - April 8, 2015, 4:29 p.m.
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.
---
 gdb/testsuite/gdb.arch/s390-vregs.S   | 4 ++--
 gdb/testsuite/gdb.arch/s390-vregs.exp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/gdb/testsuite/gdb.arch/s390-vregs.S b/gdb/testsuite/gdb.arch/s390-vregs.S
index 4b48a83..7388e7d 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 8333c32..7d3c9bb 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
 }