From 6af79bbe8b813b0434f964da4b6f17f47856a04a Mon Sep 17 00:00:00 2001 From: nickc Date: Wed, 4 Jul 2007 11:14:59 +0000 Subject: [PATCH] * symbols.c (symbol_relc_make_value): Use bfd_sprintf_vma in order to get the right length of printed value. --- gas/ChangeLog | 5 +++++ gas/symbols.c | 2 +- gas/testsuite/ChangeLog | 5 +++++ gas/testsuite/gas/mep/relocs.d | 36 ++++++++++++++++++------------------ 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index a588761d43..caf11f04cf 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2007-07-04 Nick Clifton + + * symbols.c (symbol_relc_make_value): Use bfd_sprintf_vma in order + to get the right length of printed value. + 2007-07-03 Nick Clifton * COPYING: Replace with GPLv3 text. diff --git a/gas/symbols.c b/gas/symbols.c index 480e3e3507..e8c7154ede 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -3004,7 +3004,7 @@ symbol_relc_make_value (offsetT val) char * terminal = xmalloc (28); /* Enough for long long. */ terminal[0] = '#'; - sprintf_vma (& terminal[1], val); + bfd_sprintf_vma (stdoutput, terminal + 1, val); return terminal; } diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 6174de9859..755e6825cc 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-07-04 Nick Clifton + + * gas/mep/relocs.d: Fix expected disassembly to work on 64-bit + hosts. + 2007-07-03 M R Swami Reddy * gas/elf/elf.exp: Expect redef test to fail for CR16. diff --git a/gas/testsuite/gas/mep/relocs.d b/gas/testsuite/gas/mep/relocs.d index 602545a316..406e589759 100644 --- a/gas/testsuite/gas/mep/relocs.d +++ b/gas/testsuite/gas/mep/relocs.d @@ -60,38 +60,38 @@ Disassembly of section .text: 103e: 00 00 nop 1040: 00 00 nop 1042: c5 3c ef ee lb \$5,-4114\(\$3\) - 1046: dd 49 ff df bsr ffffefee <0-:s3:foo> - 104a: e5 09 ef d2 repeat \$5,ffffefee <0-:s3:foo> + 1046: dd 49 ff df bsr ffffefee <0-:s3:foo.*> + 104a: e5 09 ef d2 repeat \$5,ffffefee <0-:s3:foo.*> 104e: 00 00 nop 1050: 00 00 nop 1052: c5 3c 20 2c lb \$5,8236\(\$3\) 1056: de b9 00 0f bsr 202c <\+:s3:foo:s3:bar> 105a: e5 09 07 e9 repeat \$5,202c <\+:s3:foo:s3:bar> - 105e: dc 88 00 80 jmp 8090 <<<:s3:foo:#00000003> - 1062: d8 18 00 02 jmp 202 <>>:s3:foo:#00000003> - 1066: df c8 7f ff jmp 7ffff8 <&:-:s3:foo:s3:bar:#007fffff> - 106a: df 28 7f ff jmp 7fffe4 <&:-:s3:foo:s4:main:#007fffff> - 106e: df 78 7f ff jmp 7fffee <&:-:S5:.text:s3:foo:#007fffff> - 1072: dd 98 00 01 jmp 1b2 <&:-:S5:.data:s3:foo:#007fffff> + 105e: dc 88 00 80 jmp 8090 <<<:s3:foo:#0+03> + 1062: d8 18 00 02 jmp 202 <>>:s3:foo:#0+03> + 1066: df c8 7f ff jmp 7ffff8 <&:-:s3:foo:s3:bar:#0+7fffff> + 106a: df 28 7f ff jmp 7fffe4 <&:-:s3:foo:s4:main:#0+7fffff> + 106e: df 78 7f ff jmp 7fffee <&:-:S5:.text:s3:foo:#0+7fffff> + 1072: dd 98 00 01 jmp 1b2 <&:-:S5:.data:s3:foo:#0+7fffff> 1076: da 98 00 0f jmp f52 <-:s3:foo:\+:s9:.text.end:0-:S5:.text> - 107a: db f8 00 70 jmp 707e <\*:s3:foo:#00000007> - 107e: da 58 00 02 jmp 24a <>>:s3:foo:#00000003\+0x48> + 107a: db f8 00 70 jmp 707e <\*:s3:foo:#0+07> + 107e: da 58 00 02 jmp 24a <>>:s3:foo:#0+03\+0x48> 1082: d8 28 00 00 jmp 4 <__assert_based_size\+0x3> 1086: d8 48 00 00 jmp 8 <\^:s3:foo:s3:bar> 108a: d8 d8 00 10 jmp 101a <|:s3:foo:s3:bar> 108e: d8 98 00 10 jmp 1012 <&:s3:foo:s3:bar> - 1092: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#00000005> - 1096: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#00000005> - 109a: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#00000005> - 109e: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#00000005> - 10a2: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#00000005> - 10a6: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#00000005> - 10aa: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#00000005> + 1092: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#0+05> + 1096: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#0+05> + 109a: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#0+05> + 109e: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#0+05> + 10a2: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#0+05> + 10a6: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#0+05> + 10aa: d9 08 00 00 jmp 20 <<<:&&:s3:foo:s3:bar:#0+05> 10ae: 00 00 nop 10b0: 00 00 nop 10b2: 00 00 nop 10b4: 00 00 nop - 10b6: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#00000005> + 10b6: d8 08 00 00 jmp 0 <<<:==:s3:foo:s3:bar:#0+05> 10ba: 00 00 nop 10bc: 00 00 nop 10be: 00 00 nop -- 2.11.0