2010-02-05 Christophe Lyon <christophe.lyon@st.com>

	binutils/
	* objdump.c (disassemble_bytes): Clear aux->reloc before printing
	a new address, so as not to reuse a previous, non-related reloc.

	gas/testsuite/
	* gas/arm/arm-it-auto.d, gas/arm/bl-local-v4t.d,
	gas/arm/blx-local.d, gas/arm/thumb-w-good.d: Update expected
	results.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 98346e91da50f9ba99d9936b5a2e690bad1e81ac..c48a0a98bcc1ddc266e496d13d6aefb2ee514079 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-05  Christophe Lyon  <christophe.lyon@st.com>
+
+       * objdump.c (disassemble_bytes): Clear aux->reloc before printing
+       a new address, so as not to reuse a previous, non-related reloc.
+
 2010-01-05  Alan Modra  <amodra@gmail.com>
 
        PR 11129

diff --git a/binutils/objdump.c b/binutils/objdump.c
index dd0d0ef50c27a1c1438694658376c509a4cc13ec..ff2d7032dbb9e09ca54a62f3ad9a4d1b014f7008 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1465,6 +1465,9 @@ disassemble_bytes (struct disassemble_info * info,
       previous_octets = octets;
       octets = 0;
 
+      /* Make sure we don't use relocs from previous instructions.  */
+      aux->reloc = NULL;
+
       /* If we see more than SKIP_ZEROES octets of zeroes, we just
         print `...'.  */
       for (z = addr_offset * opb; z < stop_offset * opb; z++)
@@ -1568,8 +1571,6 @@ disassemble_bytes (struct disassemble_info * info,
                      info->flags |= INSN_HAS_RELOC;
                      aux->reloc = **relppp;
                    }
-                 else
-                   aux->reloc = NULL;
                }
 
              octets = (*disassemble_fn) (section->vma + addr_offset, info);

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 417e4f362d3a11a754958afd4a0c0ecb5702abe1..22df83498f20cace99a90b6cbb136f07acd5c93e 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-05  Christophe Lyon  <christophe.lyon@st.com>
+
+       * gas/arm/arm-it-auto.d, gas/arm/bl-local-v4t.d,
+       gas/arm/blx-local.d, gas/arm/thumb-w-good.d: Update expected
+       results.
+
 2010-01-30  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
        * gas/ppc/xcoff-ref-1.s, gas/ppc/xcoff-ref-1.l: New test.

diff --git a/gas/testsuite/gas/arm/arm-it-auto.d b/gas/testsuite/gas/arm/arm-it-auto.d
index 68d5d4ac1475e815858e958fddbaa05e4954c016..bfdd9d64d4aded06989f05b654a8c9adb8d12e14 100644 (file)
--- a/gas/testsuite/gas/arm/arm-it-auto.d
+++ b/gas/testsuite/gas/arm/arm-it-auto.d
@@ -71,11 +71,11 @@ Disassembly of section .text:
 0000008c <main\+0x8c> bf18             it      ne
 0000008e <main\+0x8e> 200d             movne   r0, #13
 00000090 <main\+0x90> f... f...        bl      0000000. <f.*>
-00000094 <f\+0x94> bd10        pop     {r4, pc}
-00000096 <f\+0x96> f... f...   bl      0000000. <f.*>
-0000009a <f\+0x9a> bfb8        it      lt
-0000009c <f\+0x9c> 2000        movlt   r0, #0
-0000009e <f\+0x9e> 4348        muls    r0, r1
-000000a0 <f\+0xa0> bfb8        it      lt
-000000a2 <f\+0xa2> 2000        movlt   r0, #0
-000000a4 <f\+0xa4> 4348        muls    r0, r1
+00000094 <main\+0x94> bd10             pop     {r4, pc}
+00000096 <main\+0x96> f... f...        bl      0000000. <f.*>
+0000009a <main\+0x9a> bfb8             it      lt
+0000009c <main\+0x9c> 2000             movlt   r0, #0
+0000009e <main\+0x9e> 4348             muls    r0, r1
+000000a0 <main\+0xa0> bfb8             it      lt
+000000a2 <main\+0xa2> 2000             movlt   r0, #0
+000000a4 <main\+0xa4> 4348             muls    r0, r1

diff --git a/gas/testsuite/gas/arm/bl-local-v4t.d b/gas/testsuite/gas/arm/bl-local-v4t.d
index 767d9ce4784175386402df2bdb6f0a01e4618244..959f6b2babfb892c1414ab65acb5c42255b255ff 100644 (file)
--- a/gas/testsuite/gas/arm/bl-local-v4t.d
+++ b/gas/testsuite/gas/arm/bl-local-v4t.d
@@ -7,13 +7,13 @@
 .*: +file format .*arm.*
 Disassembly of section .text:
 0+00 <[^>]*> f7ff fffe         bl      00+18 <[^>]*>   0: R_ARM_THM_CALL       foo2
-0+1c <[^>]*> d004              beq.n   00+28 <[^>]*>
-0+1e <[^>]*> e003              b.n     00+28 <[^>]*>
-0+20 <[^>]*> f000 f808         bl      00+34 <[^>]*>
-0+24 <[^>]*> f000 f802         bl      00+2c <[^>]*>
-0+28 <[^>]*> 46c0              nop                     ; \(mov r8, r8\)
-0+2a <[^>]*> 46c0              nop                     ; \(mov r8, r8\)
-0+2c <[^>]*> 46c0              nop                     ; \(mov r8, r8\)
+0+04 <[^>]*> d004              beq.n   00+10 <[^>]*>
+0+06 <[^>]*> e003              b.n     00+10 <[^>]*>
+0+08 <[^>]*> f000 f808         bl      00+1c <[^>]*>
+0+0c <[^>]*> f000 f802         bl      00+14 <[^>]*>
+0+10 <[^>]*> 46c0              nop                     ; \(mov r8, r8\)
+0+12 <[^>]*> 46c0              nop                     ; \(mov r8, r8\)
+0+14 <[^>]*> 46c0              nop                     ; \(mov r8, r8\)
        ...
-0+30 <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)
-0+34 <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)
+0+18 <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)
+0+1c <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)

diff --git a/gas/testsuite/gas/arm/blx-local.d b/gas/testsuite/gas/arm/blx-local.d
index 5aae7bada61368c21a5f45d20c8442d453e3582e..2f9a90dfa427aa15ee2317250ce88fd982442f2d 100644 (file)
--- a/gas/testsuite/gas/arm/blx-local.d
+++ b/gas/testsuite/gas/arm/blx-local.d
@@ -23,7 +23,7 @@ Disassembly of section .text:
 0+2c <[^>]*> 0afffffc  beq     00000024 <fooundefthumb>
 0+30 <[^>]*> eafffffb  b       00000024 <fooundefthumb>
 0+34 <[^>]*> 0bfffffe  bleq    00000020 <foo>  34: R_ARM_JUMP24        foo
-0+58 <[^>]*> 0afffffe  beq     00000020 <foo>  38: R_ARM_JUMP24        foo
-0+5c <[^>]*> eafffffe  b       00000020 <foo>  3c: R_ARM_JUMP24        foo
-0+60 <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)
-0+64 <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)
+0+38 <[^>]*> 0afffffe  beq     00000020 <foo>  38: R_ARM_JUMP24        foo
+0+3c <[^>]*> eafffffe  b       00000020 <foo>  3c: R_ARM_JUMP24        foo
+0+40 <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)
+0+44 <[^>]*> e1a00000  nop                     ; \(mov r0, r0\)

diff --git a/gas/testsuite/gas/arm/thumb-w-good.d b/gas/testsuite/gas/arm/thumb-w-good.d
index 645a951faadb0598bd0759dcec56a9be2d0afcb0..d41493f9498d51c17af5c2b6e024d3688cc240dd 100644 (file)
--- a/gas/testsuite/gas/arm/thumb-w-good.d
+++ b/gas/testsuite/gas/arm/thumb-w-good.d
@@ -6,4 +6,4 @@
 
 Disassembly of section .text:
 00000000 <.text> f7ff fffe     bl      00000000 <foo>
-00000004 <foo\+0x4> f3ef 8000  mrs     r0, CPSR
+00000004 <.text\+0x4> f3ef 8000        mrs     r0, CPSR