Relocate with .bss instead of using the symbol. Matches gas behavior.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116741 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 1e0d535251fead17147bbae4452025c18971719c..b5943ec717b87b314a25826f8d84b1ba7b08a886 100644 (file)
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -560,6 +560,9 @@ static bool ShouldRelocOnSymbol(const MCSymbolData &SD,
   const MCSectionELF &Sec2 =
     static_cast<const MCSectionELF&>(F.getParent()->getSection());
 
+  if (Section.getKind().isBSS())
+    return false;
+
   if (&Sec2 != &Section &&
       (Kind == MCSymbolRefExpr::VK_PLT ||
        Kind == MCSymbolRefExpr::VK_GOTPCREL ||

diff --git a/test/MC/ELF/relocation-386.s b/test/MC/ELF/relocation-386.s
index 68dc13268dfc68589136dd2e3a40972c5477ab76..a29db542a8e35b6e26d57ef4aa01829a494bf80d 100644 (file)
--- a/test/MC/ELF/relocation-386.s
+++ b/test/MC/ELF/relocation-386.s
@@ -3,10 +3,23 @@
 // Test that we produce the correct relocation types and that the relocation
 // to .Lfoo uses the symbol and not the section.
 
+// Section 3 is bss
+// CHECK:      # Section 3
+// CHECK-NEXT: (('sh_name', 13) # '.bss'
 
 // CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 5) # '.Lfoo'
 
+// Symbol 6 is section 3
+// CHECK:      # Symbol 6
+// CHECK-NEXT: (('st_name', 0) # ''
+// CHECK-NEXT:  ('st_value', 0)
+// CHECK-NEXT:  ('st_size', 0)
+// CHECK-NEXT:  ('st_bind', 0)
+// CHECK-NEXT:  ('st_type', 3)
+// CHECK-NEXT:  ('st_other', 0)
+// CHECK-NEXT:  ('st_shndx', 3)
+
 // CHECK:      # Relocation 0
 // CHECK-NEXT: (('r_offset', 2)
 // CHECK-NEXT:  ('r_sym', 1)
@@ -21,6 +34,13 @@
 // CHECK-NEXT: (('r_offset',
 // CHECK-NEXT:  ('r_sym',
 // CHECK-NEXT:  ('r_type', 10)
+// CHECK-NEXT: ),
+
+// Relocation 3 (bar3@GOTOFF) is done symbol 6 (bss)
+// CHECK-NEXT:  # Relocation 3
+// CHECK-NEXT: (('r_offset',
+// CHECK-NEXT:  ('r_sym', 6
+// CHECK-NEXT:  ('r_type',
 // CHECK-NEXT: ),
 
         .text
@@ -31,6 +51,11 @@ bar:
 bar2:
        calll   bar2@PLT
        addl    $_GLOBAL_OFFSET_TABLE_, %ebx
+       movb    bar3@GOTOFF(%ebx), %al
+
+       .type   bar3,@object
+       .local  bar3
+       .comm   bar3,1,1
 
         .section       .rodata.str1.16,"aMS",@progbits,1
 .Lfoo: