Index: llvm/trunk/test/Object/nm-trivial-object.test
===================================================================
--- llvm/trunk/test/Object/nm-trivial-object.test
+++ llvm/trunk/test/Object/nm-trivial-object.test
@@ -116,20 +116,21 @@
 ABSOLUTE-ELF64: 0000000000000123 A a2
 
 ELF64-DEBUG-SYMS: 00000000 b .bss
-ELF64-DEBUG-SYMS: 00000000 d .data
-ELF64-DEBUG-SYMS: 00000000 N .debug_abbrev
-ELF64-DEBUG-SYMS: 00000000 N .debug_aranges
-ELF64-DEBUG-SYMS: 00000000 N .debug_frame
-ELF64-DEBUG-SYMS: 00000000 N .debug_info
-ELF64-DEBUG-SYMS: 00000000 N .debug_line
-ELF64-DEBUG-SYMS: 00000000 N .debug_pubnames
-ELF64-DEBUG-SYMS: 00000000 n .note.GNU-stack
-ELF64-DEBUG-SYMS: 00000000 t .text
-ELF64-DEBUG-SYMS: 00000000 a IsNAN.cpp
-ELF64-DEBUG-SYMS: 00000014 T _ZN4llvm5IsNANEd
-ELF64-DEBUG-SYMS: 00000000 T _ZN4llvm5IsNANEf
-ELF64-DEBUG-SYMS:          U __isnan
-ELF64-DEBUG-SYMS:          U __isnanf
+ELF64-DEBUG-SYMS-NEXT: 00000000 n .comment
+ELF64-DEBUG-SYMS-NEXT: 00000000 d .data
+ELF64-DEBUG-SYMS-NEXT: 00000000 N .debug_abbrev
+ELF64-DEBUG-SYMS-NEXT: 00000000 N .debug_aranges
+ELF64-DEBUG-SYMS-NEXT: 00000000 N .debug_frame
+ELF64-DEBUG-SYMS-NEXT: 00000000 N .debug_info
+ELF64-DEBUG-SYMS-NEXT: 00000000 N .debug_line
+ELF64-DEBUG-SYMS-NEXT: 00000000 N .debug_pubnames
+ELF64-DEBUG-SYMS-NEXT: 00000000 n .note.GNU-stack
+ELF64-DEBUG-SYMS-NEXT: 00000000 t .text
+ELF64-DEBUG-SYMS-NEXT: 00000000 a IsNAN.cpp
+ELF64-DEBUG-SYMS-NEXT: 00000014 T _ZN4llvm5IsNANEd
+ELF64-DEBUG-SYMS-NEXT: 00000000 T _ZN4llvm5IsNANEf
+ELF64-DEBUG-SYMS-NEXT:          U __isnan
+ELF64-DEBUG-SYMS-NEXT:          U __isnanf
 
 macho:          U _SomeOtherFunction
 macho: 00000000 T _main
Index: llvm/trunk/tools/llvm-nm/llvm-nm.cpp
===================================================================
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp
@@ -935,6 +935,7 @@
     return StringSwitch<char>(*Name)
         .StartsWith(".debug", 'N')
         .StartsWith(".note", 'n')
+        .StartsWith(".comment", 'n')
         .Default('?');
   }