darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Increment length by 1 if the relocation token is removed

Browse source 
gas/

	PR gas/15019
	* config/tc-i386.c (lex_got): Increment length by 1 if the
	relocation token is removed.

gas/testsuite/

	PR gas/15019
	* gas/i386/reloc32.s: Add tests for "xtrn@got -/+ 4".
	* gas/i386/reloc64.s: Likewise.
	* gas/i386/ilp32/reloc64.s: Likewise.

	* gas/i386/reloc32.d: Updated.
	* gas/i386/reloc64.d: Likewise.
	* gas/i386/ilp32/reloc64.d: Likewise.
This commit is contained in:
H.J. Lu 2013-01-15 20:34:11 +00:00
parent 1e53645179
commit af89796ad5
9 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gas/ChangeLog
View file

@ -1,3 +1,9 @@
2013-01-15 H.J. Lu <hongjiu.lu@intel.com>
PR gas/15019
* config/tc-i386.c (lex_got): Increment length by 1 if the
relocation token is removed.
2013-01-15 Nick Clifton <nickc@redhat.com> 2013-01-15 Nick Clifton <nickc@redhat.com>
* config/tc-v850.c (md_assemble): Allow signed values for * config/tc-v850.c (md_assemble): Allow signed values for
@ -6,7 +12,7 @@
2013-01-11 Sean Keys <skeys@ipdatasys.com> 2013-01-11 Sean Keys <skeys@ipdatasys.com>
* config/tc-xgate.c (md_begin): Fix mistake made when going from * config/tc-xgate.c (md_begin): Fix mistake made when going from
git to cvs. git to cvs.
2013-01-10 Peter Bergner <bergner@vnet.ibm.com> 2013-01-10 Peter Bergner <bergner@vnet.ibm.com>
@ -18,7 +24,7 @@
2013-01-10 Sean Keys <skeys@ipdatasys.com> 2013-01-10 Sean Keys <skeys@ipdatasys.com>
* config/tc-xgate.c (md_begin): Fix the printing of opcodes so * config/tc-xgate.c (md_begin): Fix the printing of opcodes so
that the assember exits after the opcodes have been printed. that the assember exits after the opcodes have been printed.
2013-01-10 H.J. Lu <hongjiu.lu@intel.com> 2013-01-10 H.J. Lu <hongjiu.lu@intel.com>

8
gas/config/tc-i386.c
View file

@ -6783,8 +6783,6 @@ lex_got (enum bfd_reloc_code_real *rel,
char *tmpbuf, *past_reloc; char *tmpbuf, *past_reloc;
*rel = gotrel[j].rel[object_64bit]; *rel = gotrel[j].rel[object_64bit];
if (adjust)
*adjust = len;
if (types) if (types)
{ {
@ -6819,6 +6817,12 @@ lex_got (enum bfd_reloc_code_real *rel,
/* Replace the relocation token with ' ', so that /* Replace the relocation token with ' ', so that
errors like foo@GOTOFF1 will be detected. */ errors like foo@GOTOFF1 will be detected. */
tmpbuf[first++] = ' '; tmpbuf[first++] = ' ';
else
/* Increment length by 1 if the relocation token is
removed. */
len++;
if (adjust)
*adjust = len;
memcpy (tmpbuf + first, past_reloc, second); memcpy (tmpbuf + first, past_reloc, second);
tmpbuf[first + second] = '\0'; tmpbuf[first + second] = '\0';
return tmpbuf; return tmpbuf;

11
gas/testsuite/ChangeLog
View file

@ -1,3 +1,14 @@
2013-01-15 H.J. Lu <hongjiu.lu@intel.com>
PR gas/15019
* gas/i386/reloc32.s: Add tests for "xtrn@got -/+ 4".
* gas/i386/reloc64.s: Likewise.
* gas/i386/ilp32/reloc64.s: Likewise.
* gas/i386/reloc32.d: Updated.
* gas/i386/reloc64.d: Likewise.
* gas/i386/ilp32/reloc64.d: Likewise.
2013-01-15 Nick Clifton <nickc@redhat.com> 2013-01-15 Nick Clifton <nickc@redhat.com>
* gas/v850/basic.exp: Allow for variations in reloc names. * gas/v850/basic.exp: Allow for variations in reloc names.

2
gas/testsuite/gas/i386/ilp32/reloc64.d
View file

@ -94,3 +94,5 @@ Disassembly of section \.data:
.*[ ]+R_X86_64_64[ ]+xtrn .*[ ]+R_X86_64_64[ ]+xtrn
.*[ ]+R_X86_64_64[ ]+xtrn\+0x7fffffff .*[ ]+R_X86_64_64[ ]+xtrn\+0x7fffffff
.*[ ]+R_X86_64_64[ ]+xtrn\-0x80000000 .*[ ]+R_X86_64_64[ ]+xtrn\-0x80000000
.*[ ]+R_X86_64_GOT32[ ]+xtrn-0x4
.*[ ]+R_X86_64_GOT32[ ]+xtrn\+0x4

2
gas/testsuite/gas/i386/ilp32/reloc64.s
View file

@ -184,3 +184,5 @@ bad .byte xtrn@tpoff
.quad xtrn .quad xtrn
.quad xtrn + 0x7fffffff .quad xtrn + 0x7fffffff
.quad xtrn - 0x80000000 .quad xtrn - 0x80000000
.long xtrn@got - 4
.long xtrn@got + 4

3
gas/testsuite/gas/i386/reloc32.d
View file

@ -65,3 +65,6 @@ Disassembly of section \.data:
.*[ ]+R_386_PC16[ ]+xtrn .*[ ]+R_386_PC16[ ]+xtrn
.*[ ]+R_386_8[ ]+xtrn .*[ ]+R_386_8[ ]+xtrn
.*[ ]+R_386_PC8[ ]+xtrn .*[ ]+R_386_PC8[ ]+xtrn
#...
.*[ ]+R_386_GOT32[ ]+xtrn
.*[ ]+R_386_GOT32[ ]+xtrn

2
gas/testsuite/gas/i386/reloc32.s
View file

@ -159,3 +159,5 @@ bad .byte xtrn@tlsldm
bad .byte xtrn@dtpoff bad .byte xtrn@dtpoff
bad .byte xtrn@ntpoff bad .byte xtrn@ntpoff
bad .byte xtrn@tpoff bad .byte xtrn@tpoff
.long xtrn@got + 4
.long xtrn@got - 4

2
gas/testsuite/gas/i386/reloc64.d
View file

@ -87,3 +87,5 @@ Disassembly of section \.data:
.*[ ]+R_X86_64_PC16[ ]+xtrn .*[ ]+R_X86_64_PC16[ ]+xtrn
.*[ ]+R_X86_64_8[ ]+xtrn .*[ ]+R_X86_64_8[ ]+xtrn
.*[ ]+R_X86_64_PC8[ ]+xtrn .*[ ]+R_X86_64_PC8[ ]+xtrn
.*[ ]+R_X86_64_GOT32[ ]+xtrn-0x4
.*[ ]+R_X86_64_GOT32[ ]+xtrn\+0x4

4
gas/testsuite/gas/i386/reloc64.s
View file

@ -198,3 +198,7 @@ bad .byte xtrn@tpoff
.text .text
mov xtrn@tpoff (%rbx), %eax mov xtrn@tpoff (%rbx), %eax
.data
.long xtrn@got - 4
.long xtrn@got + 4