From a7879ef118006fbac066d9901ce0a789f6858dd4 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Sun, 11 Jul 2010 08:45:51 +0000 Subject: [PATCH] 2010-07-11 Kai Tietz PR ld/11612 * config/obj-coff.c (obj_common_parse): Quote symbol-name. 2010-07-11 Kai Tietz * gas/pe/aligncomm-b.d: Regenerated content dump. * gas/pe/aligncomm-d,d: Regenerated content dump. * gas/i386/i386.exp: Disable for mingw 64-bit the intel-got64 test. --- gas/ChangeLog | 5 +++++ gas/config/obj-coff.c | 4 ++-- gas/testsuite/ChangeLog | 6 ++++++ gas/testsuite/gas/i386/i386.exp | 2 +- gas/testsuite/gas/pe/aligncomm-b.d | 17 +++++++++-------- gas/testsuite/gas/pe/aligncomm-d.d | 9 +++++---- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 038e3ce9709..4ae098e26ee 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2010-07-11 Kai Tietz + + PR ld/11612 + * config/obj-coff.c (obj_common_parse): Quote symbol-name. + 2010-07-08 Tejas Belagod * tc-arm.c (OP_oBARRIER): Remove. diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c index 792affa34d1..b71040a025c 100644 --- a/gas/config/obj-coff.c +++ b/gas/config/obj-coff.c @@ -218,10 +218,10 @@ obj_coff_common_parse (int ignore ATTRIBUTE_UNUSED, symbolS *symbolP, addressT s } /* Emit a string. Note no NUL-termination. */ - pfxlen = strlen (" -aligncomm:") + strlen (S_GET_NAME (symbolP)) + 1; + pfxlen = strlen (" -aligncomm:") + 2 + strlen (S_GET_NAME (symbolP)) + 1; numlen = snprintf (numbuff, sizeof (numbuff), "%d", (int) align); frag = frag_more (pfxlen + numlen); - (void) sprintf (frag, " -aligncomm:%s,", S_GET_NAME (symbolP)); + (void) sprintf (frag, " -aligncomm:\"%s\",", S_GET_NAME (symbolP)); memcpy (frag + pfxlen, numbuff, numlen); /* Restore original subseg. */ subseg_set (current_seg, current_subseg); diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 9818a62e53c..5f778d53171 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-07-11 Kai Tietz + + * gas/pe/aligncomm-b.d: Regenerated content dump. + * gas/pe/aligncomm-d,d: Regenerated content dump. + * gas/i386/i386.exp: Disable for mingw 64-bit the intel-got64 test. + 2010-07-08 Tejas Belagod * gas/arm/barrier.s: New file. diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index 59ad747df32..98e7ad64416 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -324,9 +324,9 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t if { ![istarget "*-*-mingw*"] } then { run_dump_test "x86-64-opcode-inval" run_dump_test "x86-64-opcode-inval-intel" + run_dump_test "intel-got64" } run_dump_test "rexw" - run_dump_test "intel-got64" run_dump_test "x86-64-fxsave" run_dump_test "x86-64-fxsave-intel" run_dump_test "x86-64-arch-1" diff --git a/gas/testsuite/gas/pe/aligncomm-b.d b/gas/testsuite/gas/pe/aligncomm-b.d index 9a162be819c..38846550227 100755 --- a/gas/testsuite/gas/pe/aligncomm-b.d +++ b/gas/testsuite/gas/pe/aligncomm-b.d @@ -6,11 +6,12 @@ .*: .* Contents of section .drectve: - 0000 202d616c 69676e63 6f6d6d3a 5f682c38 -aligncomm:_h,8 - 0010 202d616c 69676e63 6f6d6d3a 5f692c34 -aligncomm:_i,4 - 0020 202d616c 69676e63 6f6d6d3a 5f6a2c32 -aligncomm:_j,2 - 0030 202d616c 69676e63 6f6d6d3a 5f6b2c31 -aligncomm:_k,1 - 0040 202d616c 69676e63 6f6d6d3a 5f682c35 -aligncomm:_h,5 - 0050 202d616c 69676e63 6f6d6d3a 5f692c34 -aligncomm:_i,4 - 0060 202d616c 69676e63 6f6d6d3a 5f6a2c33 -aligncomm:_j,3 - 0070 202d616c 69676e63 6f6d6d3a 5f6b2c32 -aligncomm:_k,2 + 0000 202d616c 69676e63 6f6d6d3a 225f6822 -aligncomm:"_h" + 0010 2c38202d 616c6967 6e636f6d 6d3a225f ,8 -aligncomm:"_ + 0020 69222c34 202d616c 69676e63 6f6d6d3a i",4 -aligncomm: + 0030 225f6a22 2c32202d 616c6967 6e636f6d "_j",2 -aligncom + 0040 6d3a225f 6b222c31 202d616c 69676e63 m:"_k",1 -alignc + 0050 6f6d6d3a 5f682c35 202d616c 69676e63 omm:_h,5 -alignc + 0060 6f6d6d3a 5f692c34 202d616c 69676e63 omm:_i,4 -alignc + 0070 6f6d6d3a 5f6a2c33 202d616c 69676e63 omm:_j,3 -alignc + 0080 6f6d6d3a 5f6b2c32 .*omm:_k,2.* diff --git a/gas/testsuite/gas/pe/aligncomm-d.d b/gas/testsuite/gas/pe/aligncomm-d.d index 639d057dc50..05066fb29ed 100755 --- a/gas/testsuite/gas/pe/aligncomm-d.d +++ b/gas/testsuite/gas/pe/aligncomm-d.d @@ -6,7 +6,8 @@ .*: .* Contents of section .drectve: - 0000 202d616c 69676e63 6f6d6d3a 5f682c38 -aligncomm:_h,8 - 0010 202d616c 69676e63 6f6d6d3a 5f692c34 -aligncomm:_i,4 - 0020 202d616c 69676e63 6f6d6d3a 5f6a2c32 -aligncomm:_j,2 - 0030 202d616c 69676e63 6f6d6d3a 5f6b2c31 -aligncomm:_k,1 + 0000 202d616c 69676e63 6f6d6d3a 225f6822 -aligncomm:"_h" + 0010 2c38202d 616c6967 6e636f6d 6d3a225f ,8 -aligncomm:"_ + 0020 69222c34 202d616c 69676e63 6f6d6d3a i",4 -aligncomm: + 0030 225f6a22 2c32202d 616c6967 6e636f6d "_j",2 -aligncom + 0040 6d3a225f 6b222c31 m:"_k",1.* -- 2.30.2