[lld] r221425 - [mach-o] remove extra leading underscore on __bss and __got

[Nick Kledzik]

Author: kledzik
Date: Wed Nov  5 19:14:12 2014
New Revision: 221425

URL: http://llvm.org/viewvc/llvm-project?rev=221425&view=rev
Log:
[mach-o] remove extra leading underscore on __bss and __got

Modified:
    lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
    lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
    lld/trunk/test/mach-o/exe-offsets.yaml
    lld/trunk/test/mach-o/write-final-sections.yaml

Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp?rev=221425&r1=221424&r2=221425&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp Wed Nov  5 19:14:12 2014
@@ -228,9 +228,9 @@ const MachOFinalSectionFromAtomType sect
                                                           typeInitializerPtr),
   ENTRY("__DATA", "__mod_term_func",  S_MOD_TERM_FUNC_POINTERS,
                                                           typeTerminatorPtr),
-  ENTRY("__DATA", "___got",           S_NON_LAZY_SYMBOL_POINTERS,
+  ENTRY("__DATA", "__got",            S_NON_LAZY_SYMBOL_POINTERS,
                                                           typeGOT),
-  ENTRY("__DATA", "___bss",           S_ZEROFILL,         typeZeroFill),
+  ENTRY("__DATA", "__bss",            S_ZEROFILL,         typeZeroFill),
   ENTRY("__DATA", "__interposing",    S_INTERPOSING,      typeInterposingTuples),
 };
 #undef ENTRY

Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp?rev=221425&r1=221424&r2=221425&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp Wed Nov  5 19:14:12 2014
@@ -72,9 +72,9 @@ const MachORelocatableSectionToAtomType
                                                           typeInitializerPtr),
   ENTRY("__DATA", "__mod_term_func",  S_MOD_TERM_FUNC_POINTERS,
                                                           typeTerminatorPtr),
-  ENTRY("__DATA", "___got",           S_NON_LAZY_SYMBOL_POINTERS,
+  ENTRY("__DATA", "__got",            S_NON_LAZY_SYMBOL_POINTERS,
                                                           typeGOT),
-  ENTRY("__DATA", "___bss",           S_ZEROFILL,         typeZeroFill),
+  ENTRY("__DATA", "__bss",            S_ZEROFILL,         typeZeroFill),
   ENTRY("",       "",                 S_NON_LAZY_SYMBOL_POINTERS,
                                                           typeGOT),
   ENTRY("__DATA", "__interposing",    S_INTERPOSING,      typeInterposingTuples),

Modified: lld/trunk/test/mach-o/exe-offsets.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/exe-offsets.yaml?rev=221425&r1=221424&r2=221425&view=diff
==============================================================================
--- lld/trunk/test/mach-o/exe-offsets.yaml (original)
+++ lld/trunk/test/mach-o/exe-offsets.yaml Wed Nov  5 19:14:12 2014
@@ -39,7 +39,7 @@ defined-atoms:
 # CHECK:     Offset: 4096
 
 # CHECK-LABEL: Section {
-# CHECK:     Name: ___bss
+# CHECK:     Name: __bss
 # CHECK:     Segment: __DATA
 # CHECK:     Size: 0x0
 # CHECK:     Offset: 4101

Modified: lld/trunk/test/mach-o/write-final-sections.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/write-final-sections.yaml?rev=221425&r1=221424&r2=221425&view=diff
==============================================================================
--- lld/trunk/test/mach-o/write-final-sections.yaml (original)
+++ lld/trunk/test/mach-o/write-final-sections.yaml Wed Nov  5 19:14:12 2014
@@ -86,12 +86,12 @@ defined-atoms:
 # CHECK-NEXT: 0000: 08
 # CHECK-NEXT: )
 
-#  For __DATA, ___bss (with typeZeroFill)
+#  For __DATA, __bss (with typeZeroFill)
 # FIXME: Attributes & tags of __bss are mostly broken. Should be at end of
 #        __DATA, should have size, should have S_ZEROFILL flag.
   - type:            zero-fill
     size:            8
-# CHECK: Name: ___bss
+# CHECK: Name: __bss
 # CHECK: Segment: __DATA
 
 #  For __DATA, __const, (with typeConstData)
@@ -112,10 +112,10 @@ defined-atoms:
 # CHECK-NEXT: 0000: 0A00
 # CHECK-NEXT: )
 
-#  For __DATA, ___got (with typeGOT)
+#  For __DATA, __got (with typeGOT)
   - type:            got
     content:         [ 0B, 00, 00, 00, 00, 00, 00, 00 ]
-# CHECK: Name: ___got
+# CHECK: Name: __got
 # CHECK: Segment: __DATA
 # CHECK: SectionData (
 # CHECK-NEXT: 0000: 0B000000 00000000