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 3/3] MIPS/GAS: Don't convert PC-relative REL relocations against absolute symbols

From: "Maciej W. Rozycki" <macro at imgtec dot com>
To: <binutils at sourceware dot org>
Date: Tue, 12 Jul 2016 01:31:29 +0100
Subject: [PATCH 3/3] MIPS/GAS: Don't convert PC-relative REL relocations against absolute symbols
Authentication-results: sourceware.org; auth=none
References: <alpine.DEB.2.00.1607081823320.4076@tp.orcam.me.uk>
Don't convert PC-relative REL relocations against absolute symbols to 
section-relative references and retain the original symbol reference 
instead.  Offsets into the absolute section may overflow the limited 
range of their in-place addend field, causing an assembly error, e.g.:

$ cat test.s
	.text
	.globl	foo
	.ent	foo
foo:
	b	bar
	.end	foo

	.set	bar, 0x12345678
$ as -EB -32 -o test.o test.s
test.s: Assembler messages:
test.s:3: Error: relocation overflow
$

With the original reference retained the source can now be assembled and 
linked successfully:

$ as -EB -32 -o test.o test.s
$ objdump -dr test.o

test.o:     file format elf32-tradbigmips

Disassembly of section .text:

00000000 <foo>:
   0:	1000ffff 	b	0 <foo>
			0: R_MIPS_PC16	bar
   4:	00000000 	nop
	...
$ ld -melf32btsmip -Ttext 0x12340000 -e foo -o test test.o
$ objdump -dr test

test:     file format elf32-tradbigmips

Disassembly of section .text:

12340000 <foo>:
12340000:	1000159d 	b	12345678 <bar>
12340004:	00000000 	nop
	...
$

For simplicity always retain the original symbol reference, even if it 
would indeed fit.

Making TC_FORCE_RELOCATION_ABS separate from TC_FORCE_RELOCATION causes 
R_MICROMIPS_PC7_S1, R_MICROMIPS_PC10_S1 and R_MICROMIPS_PC16_S1 branch 
relocations against absolute symbols to be converted on RELA targets to 
section-relative references.  This is an intended effect of this change.  
Absolute symbols carry no ISA annotation in their `st_other' field and 
their value is not going to change with linker relaxation, so it is safe 
to discard the original reference and keep the calculated final symbol 
value only in the relocation's addend.

Similarly R6 R_MIPS_PCHI16 and R_MIPS_PCLO16 relocations referring
absolute symbols can be safely converted even on REL targets, as there
the in-place addend of these relocations covers the entire 32-bit 
address space so it can hold the calculated final symbol value, and 
likewise the value referred won't be affected by any linker relaxation.

Add a set of suitable test cases and enable REL linker tests which now
work and were previously used as dump patterns for RELA tests only.

	gas/
	* config/tc-mips.h (TC_FORCE_RELOCATION_ABS): New macro.
	(mips_force_relocation_abs): New prototype.
	* config/tc-mips.c (mips_force_relocation_abs): New function.
	* testsuite/gas/mips/branch-absolute.d: Adjust dump patterns.
	* testsuite/gas/mips/mips16-branch-absolute.d: Likewise.
	* testsuite/gas/mips/micromips-branch-absolute-n32.d: Likewise.
	* testsuite/gas/mips/micromips-branch-absolute-n64.d: Likewise.
	* testsuite/gas/mips/micromips-branch-absolute-addend-n32.d: 
	Likewise.
	* testsuite/gas/mips/micromips-branch-absolute-addend-n64.d: 
	Likewise.
	* testsuite/gas/mips/branch-absolute-addend.d: New test.
	* testsuite/gas/mips/mips16-branch-absolute-addend.d: New test.
	* testsuite/gas/mips/micromips-branch-absolute-addend.d: New 
	test.
	* testsuite/gas/mips/mips.exp: Run the new tests.

	* testsuite/ld-mips-elf/mips-elf.exp: Run 
	`branch-absolute-addend', `mips16-branch-absolute', 
	`mips16-branch-absolute-addend' and 
	`micromips-branch-absolute-addend'.
---
Hi,

 I'll push it once 1/3 has been approved.

  Maciej

binutils-mips-gas-reloc-absolute.diff
Index: binutils/gas/config/tc-mips.c
===================================================================
--- binutils.orig/gas/config/tc-mips.c	2016-07-08 21:50:21.000000000 +0100
+++ binutils/gas/config/tc-mips.c	2016-07-08 22:16:44.765712347 +0100
@@ -14814,6 +14814,22 @@ mips_force_relocation (fixS *fixp)
   return 0;
 }
 
+/* Implement TC_FORCE_RELOCATION_ABS.  */
+
+bfd_boolean
+mips_force_relocation_abs (fixS *fixp)
+{
+  if (generic_force_reloc (fixp))
+    return TRUE;
+
+  /* These relocations do not have enough bits in the in-place addend
+     to hold an arbitrary absolute section's offset.  */
+  if (HAVE_IN_PLACE_ADDENDS && limited_pcrel_reloc_p (fixp->fx_r_type))
+    return TRUE;
+
+  return FALSE;
+}
+
 /* Read the instruction associated with RELOC from BUF.  */
 
 static unsigned int
Index: binutils/gas/config/tc-mips.h
===================================================================
--- binutils.orig/gas/config/tc-mips.h	2016-07-08 21:47:55.000000000 +0100
+++ binutils/gas/config/tc-mips.h	2016-07-08 22:16:44.775791638 +0100
@@ -142,6 +142,9 @@ extern int mips_force_relocation (struct
 #define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \
   (! SEG_NORMAL (SEG) || mips_force_relocation (FIX))
 
+#define TC_FORCE_RELOCATION_ABS(FIX) mips_force_relocation_abs (FIX)
+extern bfd_boolean mips_force_relocation_abs (struct fix *);
+
 /* Register mask variables.  These are set by the MIPS assembly code
    and used by ECOFF and possibly other object file formats.  */
 extern unsigned long mips_gprmask;
Index: binutils/gas/testsuite/gas/mips/branch-absolute-addend.d
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ binutils/gas/testsuite/gas/mips/branch-absolute-addend.d	2016-07-08 22:16:44.822246006 +0100
@@ -0,0 +1,24 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch to absolute expression with addend
+#as: -32
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+	\.\.\.
+[0-9a-f]+ <[^>]*> 1000048c 	b	00002234 <foo\+0x1234>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0411048c 	bal	0000223c <foo\+0x123c>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0410048c 	bltzal	zero,00002244 <foo\+0x1244>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 1040048c 	beqz	v0,0000224c <foo\+0x124c>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 1440048c 	bnez	v0,00002254 <foo\+0x1254>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
+[0-9a-f]+ <[^>]*> 00000000 	nop
+	\.\.\.
Index: binutils/gas/testsuite/gas/mips/branch-absolute.d
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/branch-absolute.d	2016-07-08 21:47:55.000000000 +0100
+++ binutils/gas/testsuite/gas/mips/branch-absolute.d	2016-07-08 22:16:44.830398394 +0100
@@ -6,19 +6,19 @@
 
 Disassembly of section \.text:
 	\.\.\.
-[0-9a-f]+ <[^>]*> 1000048c 	b	00002234 <bar\+0x1000>
-[ 	]*[0-9a-f]+: R_MIPS_PC16	\*ABS\*
+[0-9a-f]+ <[^>]*> 1000ffff 	b	00001000 <foo>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 0411048c 	bal	0000223c <bar\+0x1008>
-[ 	]*[0-9a-f]+: R_MIPS_PC16	\*ABS\*
+[0-9a-f]+ <[^>]*> 0411ffff 	bal	00001008 <foo\+0x8>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 0410048c 	bltzal	zero,00002244 <bar\+0x1010>
-[ 	]*[0-9a-f]+: R_MIPS_PC16	\*ABS\*
+[0-9a-f]+ <[^>]*> 0410ffff 	bltzal	zero,00001010 <foo\+0x10>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 1040048c 	beqz	v0,0000224c <bar\+0x1018>
-[ 	]*[0-9a-f]+: R_MIPS_PC16	\*ABS\*
+[0-9a-f]+ <[^>]*> 1040ffff 	beqz	v0,00001018 <foo\+0x18>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 1440048c 	bnez	v0,00002254 <bar\+0x1020>
-[ 	]*[0-9a-f]+: R_MIPS_PC16	\*ABS\*
+[0-9a-f]+ <[^>]*> 1440ffff 	bnez	v0,00001020 <foo\+0x20>
+[ 	]*[0-9a-f]+: R_MIPS_PC16	bar
 [0-9a-f]+ <[^>]*> 00000000 	nop
 	\.\.\.
Index: binutils/gas/testsuite/gas/mips/micromips-branch-absolute-addend-n32.d
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/micromips-branch-absolute-addend-n32.d	2016-07-08 21:47:55.000000000 +0100
+++ binutils/gas/testsuite/gas/mips/micromips-branch-absolute-addend-n32.d	2016-07-08 22:16:44.834429865 +0100
@@ -8,19 +8,19 @@
 Disassembly of section \.text:
 	\.\.\.
 [0-9a-f]+ <[^>]*> 9400 0000 	b	00001004 <foo\+0x4>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 4060 0000 	bal	0000100a <foo\+0xa>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 4020 0000 	bltzal	zero,00001012 <foo\+0x12>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 9402 0000 	beqz	v0,0000101a <foo\+0x1a>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> b402 0000 	bnez	v0,00001020 <foo\+0x20>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
Index: binutils/gas/testsuite/gas/mips/micromips-branch-absolute-addend-n64.d
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/micromips-branch-absolute-addend-n64.d	2016-07-08 21:47:55.000000000 +0100
+++ binutils/gas/testsuite/gas/mips/micromips-branch-absolute-addend-n64.d	2016-07-08 22:16:44.837453365 +0100
@@ -8,29 +8,29 @@
 Disassembly of section \.text:
 	\.\.\.
 [0-9a-f]+ <[^>]*> 9400 0000 	b	0000000000001004 <foo\+0x4>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 4060 0000 	bal	000000000000100a <foo\+0xa>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 4020 0000 	bltzal	zero,0000000000001012 <foo\+0x12>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 9402 0000 	beqz	v0,000000000000101a <foo\+0x1a>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> b402 0000 	bnez	v0,0000000000001020 <foo\+0x20>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1230
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x123468a9
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
Index: binutils/gas/testsuite/gas/mips/micromips-branch-absolute-addend.d
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ binutils/gas/testsuite/gas/mips/micromips-branch-absolute-addend.d	2016-07-08 22:16:44.847614676 +0100
@@ -0,0 +1,25 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: microMIPS branch to absolute expression with addend
+#as: -32
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+	\.\.\.
+[0-9a-f]+ <[^>]*> 9400 0918 	b	00002234 <foo\+0x1234>
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar
+[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 4060 0918 	bal	0000223a <foo\+0x123a>
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar
+[0-9a-f]+ <[^>]*> 0000 0000 	nop
+[0-9a-f]+ <[^>]*> 4020 0918 	bltzal	zero,00002242 <foo\+0x1242>
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar
+[0-9a-f]+ <[^>]*> 0000 0000 	nop
+[0-9a-f]+ <[^>]*> 9402 0918 	beqz	v0,0000224a <foo\+0x124a>
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar
+[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> b402 0918 	bnez	v0,00002250 <foo\+0x1250>
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar
+[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 0c00      	nop
+	\.\.\.
Index: binutils/gas/testsuite/gas/mips/micromips-branch-absolute-n32.d
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/micromips-branch-absolute-n32.d	2016-07-08 21:47:55.000000000 +0100
+++ binutils/gas/testsuite/gas/mips/micromips-branch-absolute-n32.d	2016-07-08 22:16:44.868791891 +0100
@@ -8,19 +8,19 @@
 Disassembly of section \.text:
 	\.\.\.
 [0-9a-f]+ <[^>]*> 9400 0000 	b	00001004 <foo\+0x4>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 4060 0000 	bal	0000100a <foo\+0xa>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 4020 0000 	bltzal	zero,00001012 <foo\+0x12>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 9402 0000 	beqz	v0,0000101a <foo\+0x1a>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> b402 0000 	bnez	v0,00001020 <foo\+0x20>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
Index: binutils/gas/testsuite/gas/mips/micromips-branch-absolute-n64.d
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/micromips-branch-absolute-n64.d	2016-07-08 21:47:55.000000000 +0100
+++ binutils/gas/testsuite/gas/mips/micromips-branch-absolute-n64.d	2016-07-08 22:16:44.872893175 +0100
@@ -8,29 +8,29 @@
 Disassembly of section \.text:
 	\.\.\.
 [0-9a-f]+ <[^>]*> 9400 0000 	b	0000000000001004 <foo\+0x4>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 4060 0000 	bal	000000000000100a <foo\+0xa>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 4020 0000 	bltzal	zero,0000000000001012 <foo\+0x12>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 9402 0000 	beqz	v0,000000000000101a <foo\+0x1a>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> b402 0000 	bnez	v0,0000000000001020 <foo\+0x20>
-[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	bar-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
-[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*-0x4
+[ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
+[ 	]*[0-9a-f]+: R_MIPS_NONE	\*ABS\*\+0x1231
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
Index: binutils/gas/testsuite/gas/mips/mips.exp
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/mips.exp	2016-07-08 21:47:55.000000000 +0100
+++ binutils/gas/testsuite/gas/mips/mips.exp	2016-07-08 22:16:44.876925601 +0100
@@ -612,6 +612,7 @@ if { [istarget mips*-*-vxworks*] } {
 	run_dump_test "branch-local-n64-1"
     }
     run_dump_test "branch-absolute"
+    run_dump_test "branch-absolute-addend"
     if $has_newabi {
 	run_dump_test "branch-absolute-n32"
 	run_dump_test "branch-absolute-addend-n32"
@@ -1281,6 +1282,7 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "micromips-warn-branch-delay"
     run_dump_test "micromips-warn-branch-delay-1"
     run_dump_test "micromips-branch-absolute"
+    run_dump_test "micromips-branch-absolute-addend"
     if $has_newabi {
 	run_dump_test "micromips-branch-absolute-n32"
 	run_dump_test "micromips-branch-absolute-addend-n32"
@@ -1393,6 +1395,7 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips16-branch-addend-2"
     run_dump_test "mips16-branch-addend-3"
     run_dump_test "mips16-branch-absolute"
+    run_dump_test "mips16-branch-absolute-addend"
     if $has_newabi {
 	run_dump_test "mips16-branch-absolute-n32"
 	run_dump_test "mips16-branch-absolute-addend-n32"
Index: binutils/gas/testsuite/gas/mips/mips16-branch-absolute-addend.d
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ binutils/gas/testsuite/gas/mips/mips16-branch-absolute-addend.d	2016-07-08 22:16:44.892032613 +0100
@@ -0,0 +1,20 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS16 branch to absolute expression with addend
+#as: -32
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+	\.\.\.
+[0-9a-f]+ <[^>]*> f101 1018 	b	00002234 <foo\+0x1234>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f101 6018 	bteqz	00002238 <foo\+0x1238>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f101 6118 	btnez	0000223c <foo\+0x123c>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f101 2218 	beqz	v0,00002240 <foo\+0x1240>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f101 2a18 	bnez	v0,00002244 <foo\+0x1244>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> 6500      	nop
+	\.\.\.
Index: binutils/gas/testsuite/gas/mips/mips16-branch-absolute.d
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/mips16-branch-absolute.d	2016-07-08 21:50:21.000000000 +0100
+++ binutils/gas/testsuite/gas/mips/mips16-branch-absolute.d	2016-07-08 22:16:44.909181788 +0100
@@ -6,15 +6,15 @@
 
 Disassembly of section \.text:
 	\.\.\.
-[0-9a-f]+ <[^>]*> f101 1018 	b	00002234 <bar\+0xfff>
-[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	\*ABS\*
-[0-9a-f]+ <[^>]*> f101 6018 	bteqz	00002238 <bar\+0x1003>
-[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	\*ABS\*
-[0-9a-f]+ <[^>]*> f101 6118 	btnez	0000223c <bar\+0x1007>
-[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	\*ABS\*
-[0-9a-f]+ <[^>]*> f101 2218 	beqz	v0,00002240 <bar\+0x100b>
-[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	\*ABS\*
-[0-9a-f]+ <[^>]*> f101 2a18 	bnez	v0,00002244 <bar\+0x100f>
-[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	\*ABS\*
+[0-9a-f]+ <[^>]*> f7ff 101e 	b	00001000 <foo>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f7ff 601e 	bteqz	00001004 <foo\+0x4>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f7ff 611e 	btnez	00001008 <foo\+0x8>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f7ff 221e 	beqz	v0,0000100c <foo\+0xc>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
+[0-9a-f]+ <[^>]*> f7ff 2a1e 	bnez	v0,00001010 <foo\+0x10>
+[ 	]*[0-9a-f]+: R_MIPS16_PC16_S1	bar
 [0-9a-f]+ <[^>]*> 6500      	nop
 	\.\.\.
Index: binutils/ld/testsuite/ld-mips-elf/mips-elf.exp
===================================================================
--- binutils.orig/ld/testsuite/ld-mips-elf/mips-elf.exp	2016-07-08 21:50:21.000000000 +0100
+++ binutils/ld/testsuite/ld-mips-elf/mips-elf.exp	2016-07-08 22:16:44.926340159 +0100
@@ -144,6 +144,7 @@ run_dump_test "mips16-1"
 run_dump_test "branch-misc-1"
 run_dump_test "branch-misc-2"
 run_dump_test "branch-absolute" [list [list ld $abi_ldflags(o32)]]
+run_dump_test "branch-absolute-addend" [list [list ld $abi_ldflags(o32)]]
 if $has_newabi {
     run_dump_test "branch-absolute-n32" [list [list ld $abi_ldflags(n32)]]
     run_dump_test "branch-absolute-addend-n32" \
@@ -157,6 +158,9 @@ run_dump_test "mips16-branch-2" [list [l
 run_dump_test "mips16-branch-3" [list [list ld $abi_ldflags(o32)]]
 run_dump_test "mips16-branch-addend-2" [list [list ld $abi_ldflags(o32)]]
 run_dump_test "mips16-branch-addend-3" [list [list ld $abi_ldflags(o32)]]
+run_dump_test "mips16-branch-absolute" [list [list ld $abi_ldflags(o32)]]
+run_dump_test "mips16-branch-absolute-addend" \
+					[list [list ld $abi_ldflags(o32)]]
 if $has_newabi {
     run_dump_test "mips16-branch-absolute-n32" \
 					[list [list ld $abi_ldflags(n32)]]
@@ -169,6 +173,8 @@ if $has_newabi {
 }
 
 run_dump_test "micromips-branch-absolute" [list [list ld $abi_ldflags(o32)]]
+run_dump_test "micromips-branch-absolute-addend" \
+					[list [list ld $abi_ldflags(o32)]]
 if $has_newabi {
     run_dump_test "micromips-branch-absolute-n32" \
 					[list [list ld $abi_ldflags(n32)]]
References:
- [PATCH 0/3] BFD, MIPS: Fix the handling of branch relocations against absolute symbols
  - From: Maciej W. Rozycki
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]