[llvm-commits] [llvm] r115718 - in /llvm/trunk: lib/MC/ELFObjectWriter.cpp test/MC/ELF/merge.s

[Rafael Espindola]

Author: rafael
Date: Tue Oct  5 18:57:26 2010
New Revision: 115718

URL: http://llvm.org/viewvc/llvm-project?rev=115718&view=rev
Log:
Use a relocation against the symbol if it is a PLT and the symbol is in another
section. Common because of linkonce sections.

Modified:
    llvm/trunk/lib/MC/ELFObjectWriter.cpp
    llvm/trunk/test/MC/ELF/merge.s

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=115718&r1=115717&r2=115718&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Tue Oct  5 18:57:26 2010
@@ -529,7 +529,8 @@
 }
 
 static bool ShouldRelocOnSymbol(const MCSymbolData &SD,
-                                const MCValue &Target) {
+                                const MCValue &Target,
+                                const MCFragment &F) {
   const MCSymbol &Symbol = SD.getSymbol();
   if (Symbol.isUndefined())
     return true;
@@ -543,6 +544,14 @@
   if (SD.isExternal())
     return true;
 
+  const llvm::MCSymbolRefExpr& Ref = *Target.getSymA();
+  const MCSectionELF &Sec2 =
+    static_cast<const MCSectionELF&>(F.getParent()->getSection());
+
+  if (Ref.getKind() == MCSymbolRefExpr::VK_PLT &&
+      &Sec2 != &Section)
+    return true;
+
   return false;
 }
 
@@ -587,7 +596,7 @@
       return;
     }
 
-    bool RelocOnSymbol = ShouldRelocOnSymbol(SD, Target);
+    bool RelocOnSymbol = ShouldRelocOnSymbol(SD, Target, *Fragment);
     if (!RelocOnSymbol) {
       Index = F->getParent()->getOrdinal();
 

Modified: llvm/trunk/test/MC/ELF/merge.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/merge.s?rev=115718&r1=115717&r2=115718&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/merge.s (original)
+++ llvm/trunk/test/MC/ELF/merge.s Tue Oct  5 18:57:26 2010
@@ -10,10 +10,14 @@
         movsd   .Lfoo(%rip), %xmm1
         movl	$.Lfoo, %edi
         movl	$.Lfoo+2, %edi
+        jmp	foo at PLT
 
         .section        .sec1,"aM", at progbits,16
 .Lfoo:
 
+        .section	bar,"ax", at progbits
+foo:
+
 // Section 4 is "sec1"
 // CHECK: # Section 4
 // CHECK-NEXT:  (('sh_name', 18) # '.sec1'
@@ -22,8 +26,12 @@
 // CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 1) # '.Lfoo'
 
-// Symbol number 5 is section 4
-// CHECK:        # Symbol 5
+// Symbol number 2 is foo
+// CHECK:      # Symbol 2
+// CHECK-NEXT: (('st_name', 7) # 'foo'
+
+// Symbol number 6 is section 4
+// CHECK:        # Symbol 6
 // CHECK-NEXT:    (('st_name', 0) # ''
 // CHECK-NEXT:     ('st_bind', 0)
 // CHECK-NEXT:     ('st_type', 3)
@@ -39,10 +47,10 @@
 // CHECK-NEXT:    ('r_addend',
 // CHECK-NEXT:   ),
 
-// Relocation 1 refers to symbol 5
+// Relocation 1 refers to symbol 6
 // CHECK-NEXT:  # Relocation 1
 // CHECK-NEXT: (('r_offset',
-// CHECK-NEXT:  ('r_sym', 5)
+// CHECK-NEXT:  ('r_sym', 6)
 // CHECK-NEXT:  ('r_type', 10)
 // CHECK-NEXT:  ('r_addend',
 // CHECK-NEXT: ),
@@ -54,4 +62,12 @@
 // CHECK-NEXT:    ('r_type', 10
 // CHECK-NEXT:    ('r_addend',
 // CHECK-NEXT:   ),
+
+// Relocation 3 refers to symbol 2
+// CHECK-NEXT:   # Relocation 3
+// CHECK-NEXT:   (('r_offset',
+// CHECK-NEXT:    ('r_sym', 2)
+// CHECK-NEXT:    ('r_type', 4
+// CHECK-NEXT:    ('r_addend',
+// CHECK-NEXT:   ),
 // CHECK-NEXT:  ])