Index: src/gas/config/obj-coff.c
===================================================================
--- src.orig/gas/config/obj-coff.c	2010-07-10 09:23:35.000000000 +0200
+++ src/gas/config/obj-coff.c	2010-07-10 18:41:43.474907300 +0200
@@ -218,10 +218,10 @@
 	}
 
       /* 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);
Index: src/gas/testsuite/gas/pe/aligncomm-b.d
===================================================================
--- src.orig/gas/testsuite/gas/pe/aligncomm-b.d	2009-05-19 18:08:07.000000000 +0200
+++ src/gas/testsuite/gas/pe/aligncomm-b.d	2010-07-10 19:44:03.328814700 +0200
@@ -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 275f6827   -aligncomm:'_h'
+ 0010 2c38202d 616c6967 6e636f6d 6d3a275f  ,8 -aligncomm:'_
+ 0020 69272c34 202d616c 69676e63 6f6d6d3a  i',4 -aligncomm:
+ 0030 275f6a27 2c32202d 616c6967 6e636f6d  '_j',2 -aligncom
+ 0040 6d3a275f 6b272c31 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.*
Index: src/gas/testsuite/gas/pe/aligncomm-d.d
===================================================================
--- src.orig/gas/testsuite/gas/pe/aligncomm-d.d	2009-05-19 18:08:07.000000000 +0200
+++ src/gas/testsuite/gas/pe/aligncomm-d.d	2010-07-10 19:44:27.729210300 +0200
@@ -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 275f6827   -aligncomm:'_h'
+ 0010 2c38202d 616c6967 6e636f6d 6d3a275f  ,8 -aligncomm:'_
+ 0020 69272c34 202d616c 69676e63 6f6d6d3a  i',4 -aligncomm:
+ 0030 275f6a27 2c32202d 616c6967 6e636f6d  '_j',2 -aligncom
+ 0040 6d3a275f 6b272c31                    m:'_k',1.*
Index: src/gas/testsuite/gas/i386/i386.exp
===================================================================
--- src.orig/gas/testsuite/gas/i386/i386.exp	2010-07-10 09:23:42.000000000 +0200
+++ src/gas/testsuite/gas/i386/i386.exp	2010-07-10 19:54:55.179098400 +0200
@@ -324,9 +324,9 @@
     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"