This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[PATCH 15/20] MIPS/GAS/testsuite: Wildcard addresses in JAL PIC

From: "Maciej W. Rozycki" <macro at codesourcery dot com>
To: Richard Sandiford <rdsandiford at googlemail dot com>
Cc: Catherine Moore <clm at codesourcery dot com>, binutils at sourceware dot org
Date: Thu, 2 Dec 2010 19:22:05 +0000 (GMT)
Subject: [PATCH 15/20] MIPS/GAS/testsuite: Wildcard addresses in JAL PIC
Hi,

 Here is a change to update the JAL PIC test cases to also use wildcard 
address matching in relocations for easier maintenance.

2010-12-02  Maciej W. Rozycki  <macro@codesourcery.com>

	gas/testsuite/
	* gas/mips/jal-svr4pic.d: Also use wildcard address matching in 
	relocations.
	* gas/mips/mips1@jal-svr4pic.d: Likewise.
	* gas/mips/jal-svr4pic-noreorder.d: Likewise.
	* gas/mips/mips1@jal-svr4pic-noreorder.d: Likewise.

 OK to apply?

  Maciej

binutils-gas-test-jal-svr4pic.diff
Index: binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d	2010-12-01 21:05:40.000000000 +0000
+++ binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d	2010-12-01 21:05:58.000000000 +0000
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000 	lui	gp,0x0
-[ 	]*0: R_MIPS_HI16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_HI16	_gp_disp
 [0-9a-f]+ <[^>]*> 279c0000 	addiu	gp,gp,0
-[ 	]*4: R_MIPS_LO16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_LO16	_gp_disp
 [0-9a-f]+ <[^>]*> 0399e021 	addu	gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000 	sw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
@@ -21,23 +21,23 @@
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*28: R_MIPS_GOT16	.text
+[ 	]*[0-9a-f]+: R_MIPS_GOT16	.text
 [0-9a-f]+ <[^>]*> 27390000 	addiu	t9,t9,0
-[ 	]*2c: R_MIPS_LO16	.text
+[ 	]*[0-9a-f]+: R_MIPS_LO16	.text
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*30: R_MIPS_JALR	text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*3c: R_MIPS_CALL16	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	weak_text_label
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*40: R_MIPS_JALR	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	weak_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*4c: R_MIPS_CALL16	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	external_text_label
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*50: R_MIPS_JALR	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	external_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 1000ffe8 	b	0+0000 <text_label>
Index: binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/jal-svr4pic.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/gas/testsuite/gas/mips/jal-svr4pic.d	2010-12-01 21:05:40.000000000 +0000
+++ binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/jal-svr4pic.d	2010-12-01 21:05:58.000000000 +0000
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000 	lui	gp,0x0
-[ 	]*0: R_MIPS_HI16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_HI16	_gp_disp
 [0-9a-f]+ <[^>]*> 279c0000 	addiu	gp,gp,0
-[ 	]*4: R_MIPS_LO16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_LO16	_gp_disp
 [0-9a-f]+ <[^>]*> 0399e021 	addu	gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000 	sw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
@@ -20,23 +20,23 @@
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*24: R_MIPS_GOT16	.text
+[ 	]*[0-9a-f]+: R_MIPS_GOT16	.text
 [0-9a-f]+ <[^>]*> 27390000 	addiu	t9,t9,0
-[ 	]*28: R_MIPS_LO16	.text
+[ 	]*[0-9a-f]+: R_MIPS_LO16	.text
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*2c: R_MIPS_JALR	text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*38: R_MIPS_CALL16	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	weak_text_label
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*3c: R_MIPS_JALR	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	weak_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*48: R_MIPS_CALL16	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	external_text_label
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*4c: R_MIPS_JALR	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	external_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 1000ffea 	b	0+0000 <text_label>
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
Index: binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d	2010-12-01 21:05:40.000000000 +0000
+++ binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d	2010-12-01 21:05:58.000000000 +0000
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000 	lui	gp,0x0
-[ 	]*0: R_MIPS_HI16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_HI16	_gp_disp
 [0-9a-f]+ <[^>]*> 279c0000 	addiu	gp,gp,0
-[ 	]*4: R_MIPS_LO16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_LO16	_gp_disp
 [0-9a-f]+ <[^>]*> 0399e021 	addu	gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000 	sw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
@@ -21,26 +21,26 @@
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*28: R_MIPS_GOT16	.text
+[ 	]*[0-9a-f]+: R_MIPS_GOT16	.text
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 27390000 	addiu	t9,t9,0
-[ 	]*30: R_MIPS_LO16	.text
+[ 	]*[0-9a-f]+: R_MIPS_LO16	.text
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*34: R_MIPS_JALR	text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*40: R_MIPS_CALL16	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	weak_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*48: R_MIPS_JALR	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	weak_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*54: R_MIPS_CALL16	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	external_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*5c: R_MIPS_JALR	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	external_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 1000ffe5 	b	0+0000 <text_label>
Index: binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/mips1@jal-svr4pic.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/gas/testsuite/gas/mips/mips1@jal-svr4pic.d	2010-12-01 21:05:40.000000000 +0000
+++ binutils-fsf-trunk-quilt/gas/testsuite/gas/mips/mips1@jal-svr4pic.d	2010-12-01 21:05:58.000000000 +0000
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000 	lui	gp,0x0
-[ 	]*0: R_MIPS_HI16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_HI16	_gp_disp
 [0-9a-f]+ <[^>]*> 279c0000 	addiu	gp,gp,0
-[ 	]*4: R_MIPS_LO16	_gp_disp
+[ 	]*[0-9a-f]+: R_MIPS_LO16	_gp_disp
 [0-9a-f]+ <[^>]*> 0399e021 	addu	gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000 	sw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
@@ -22,28 +22,28 @@
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*2c: R_MIPS_GOT16	.text
+[ 	]*[0-9a-f]+: R_MIPS_GOT16	.text
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 27390000 	addiu	t9,t9,0
-[ 	]*34: R_MIPS_LO16	.text
+[ 	]*[0-9a-f]+: R_MIPS_LO16	.text
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*38: R_MIPS_JALR	text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*48: R_MIPS_CALL16	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	weak_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*50: R_MIPS_JALR	weak_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	weak_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
-[ 	]*60: R_MIPS_CALL16	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_CALL16	external_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
-[ 	]*68: R_MIPS_JALR	external_text_label
+[ 	]*[0-9a-f]+: R_MIPS_JALR	external_text_label
 [0-9a-f]+ <[^>]*> 00000000 	nop
 [0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 1000ffe2 	b	0+0000 <text_label>
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]