Index: llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp
===================================================================
--- llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp
+++ llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp
@@ -229,22 +229,23 @@
   }
 
   for (;;) {
-    unsigned CurSize;
-
+    
     SMLoc PrevLoc = getLexer().getLoc();
-    if (getLexer().is(AsmToken::Minus)) {
-      CurSize = 1;
-      Lex(); // Consume the "-".
-    } else if (getLexer().is(AsmToken::String)) {
+    if (getLexer().is(AsmToken::Comma) ||
+      getLexer().is(AsmToken::EndOfStatement))
+      break;
+    
+    unsigned CurSize;
+    if (getLexer().is(AsmToken::String)) {
       CurSize = getTok().getIdentifier().size() + 2;
       Lex();
     } else if (getLexer().is(AsmToken::Identifier)) {
       CurSize = getTok().getIdentifier().size();
       Lex();
     } else {
-      break;
+      CurSize = getTok().getString().size();
+      Lex();
     }
-
     Size += CurSize;
     SectionName = StringRef(FirstLoc.getPointer(), Size);
 
Index: llvm/trunk/test/MC/ELF/section.s
===================================================================
--- llvm/trunk/test/MC/ELF/section.s
+++ llvm/trunk/test/MC/ELF/section.s
@@ -6,11 +6,15 @@
 .section	.note.GNU-stack2,"",%progbits
 .section	.note.GNU-,"",@progbits
 .section	-.note.GNU,"","progbits"
+.section	src/stack.c,"",@progbits
+.section	~!@$%^&*()_-+={[}]|\\:<>,"",@progbits
 
 // CHECK: Name: .note.GNU-stack
 // CHECK: Name: .note.GNU-stack2
 // CHECK: Name: .note.GNU-
 // CHECK: Name: -.note.GNU
+// CHECK: Name: src/stack.c
+// CHECK: Name: ~!@$%^&*()_-+={[}]|\\:<>
 
 // Test that the defaults are used