[llvm-commits] [llvm] r117543 - in /llvm/trunk: include/llvm/MC/MCExpr.h lib/MC/ELFObjectWriter.cpp lib/MC/MCExpr.cpp test/MC/ELF/relocation-386.s

[Rafael Espindola]

Author: rafael
Date: Thu Oct 28 09:22:44 2010
New Revision: 117543

URL: http://llvm.org/viewvc/llvm-project?rev=117543&view=rev
Log:
Implement VK_GOTNTPOFF and switch RelocNeedsGOT to use VariantKind.

Modified:
    llvm/trunk/include/llvm/MC/MCExpr.h
    llvm/trunk/lib/MC/ELFObjectWriter.cpp
    llvm/trunk/lib/MC/MCExpr.cpp
    llvm/trunk/test/MC/ELF/relocation-386.s

Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=117543&r1=117542&r2=117543&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Thu Oct 28 09:22:44 2010
@@ -134,6 +134,7 @@
     VK_GOTTPOFF,
     VK_INDNTPOFF,
     VK_NTPOFF,
+    VK_GOTNTPOFF,
     VK_PLT,
     VK_TLSGD,
     VK_TPOFF,

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=117543&r1=117542&r2=117543&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Thu Oct 28 09:22:44 2010
@@ -78,21 +78,19 @@
   }
 }
 
-static bool RelocNeedsGOT(unsigned Type) {
-  // FIXME: Can we use the VariantKind?
-  switch (Type) {
+static bool RelocNeedsGOT(MCSymbolRefExpr::VariantKind Variant) {
+  switch (Variant) {
   default:
     return false;
-  case ELF::R_X86_64_GOT32:
-  case ELF::R_X86_64_PLT32:
-  case ELF::R_X86_64_GOTPCREL:
-  case ELF::R_X86_64_TPOFF32:
-  case ELF::R_X86_64_TLSGD:
-  case ELF::R_X86_64_GOTTPOFF:
-  case ELF::R_386_TLS_GD:
-  case ELF::R_386_TLS_LE_32:
-  case ELF::R_386_TLS_IE:
-  case ELF::R_386_TLS_LE:
+  case MCSymbolRefExpr::VK_GOT:
+  case MCSymbolRefExpr::VK_PLT:
+  case MCSymbolRefExpr::VK_GOTPCREL:
+  case MCSymbolRefExpr::VK_TPOFF:
+  case MCSymbolRefExpr::VK_TLSGD:
+  case MCSymbolRefExpr::VK_GOTTPOFF:
+  case MCSymbolRefExpr::VK_INDNTPOFF:
+  case MCSymbolRefExpr::VK_NTPOFF:
+  case MCSymbolRefExpr::VK_GOTNTPOFF:
     return true;
   }
 }
@@ -692,7 +690,7 @@
       case MCSymbolRefExpr::VK_PLT:
         Type = ELF::R_X86_64_PLT32;
         break;
-      case llvm::MCSymbolRefExpr::VK_GOTPCREL:
+      case MCSymbolRefExpr::VK_GOTPCREL:
         Type = ELF::R_X86_64_GOTPCREL;
         break;
       case MCSymbolRefExpr::VK_GOTTPOFF:
@@ -783,6 +781,9 @@
         case MCSymbolRefExpr::VK_NTPOFF:
           Type = ELF::R_386_TLS_LE;
           break;
+        case MCSymbolRefExpr::VK_GOTNTPOFF:
+          Type = ELF::R_386_TLS_GOTIE;
+          break;
         }
         break;
       case FK_Data_2: Type = ELF::R_386_16; break;
@@ -792,7 +793,7 @@
     }
   }
 
-  if (RelocNeedsGOT(Type))
+  if (RelocNeedsGOT(Modifier))
     NeedsGOT = true;
 
   ELFRelocationEntry ERE;

Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=117543&r1=117542&r2=117543&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Thu Oct 28 09:22:44 2010
@@ -175,6 +175,7 @@
   case VK_GOTTPOFF: return "GOTTPOFF";
   case VK_INDNTPOFF: return "INDNTPOFF";
   case VK_NTPOFF: return "NTPOFF";
+  case VK_GOTNTPOFF: return "GOTNTPOFF";
   case VK_PLT: return "PLT";
   case VK_TLSGD: return "TLSGD";
   case VK_TPOFF: return "TPOFF";
@@ -194,6 +195,7 @@
     .Case("GOTTPOFF", VK_GOTTPOFF)
     .Case("INDNTPOFF", VK_INDNTPOFF)
     .Case("NTPOFF", VK_NTPOFF)
+    .Case("GOTNTPOFF", VK_GOTNTPOFF)
     .Case("PLT", VK_PLT)
     .Case("TLSGD", VK_TLSGD)
     .Case("TPOFF", VK_TPOFF)

Modified: llvm/trunk/test/MC/ELF/relocation-386.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/relocation-386.s?rev=117543&r1=117542&r2=117543&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/relocation-386.s (original)
+++ llvm/trunk/test/MC/ELF/relocation-386.s Thu Oct 28 09:22:44 2010
@@ -76,6 +76,14 @@
 // CHECK-NEXT: (('r_offset', 0x00000031)
 // CHECK-NEXT:  ('r_sym', 0x0000000b)
 // CHECK-NEXT:  ('r_type', 0x00000011)
+// CHECK-NEXT: ),
+
+// Relocation 9 (foo at GOTNTPOFF) is of type R_386_TLS_GOTIE
+// CHECK-NEXT: # Relocation 0x00000009
+// CHECK-NEXT: (('r_offset', 0x00000037)
+// CHECK-NEXT:  ('r_sym', 0x0000000b)
+// CHECK-NEXT:  ('r_type', 0x00000010)
+// CHECK-NEXT: ),
 
         .text
 bar:
@@ -97,6 +105,7 @@
         movl $foo at TPOFF, %edx
         movl foo at INDNTPOFF, %ecx
         addl foo at NTPOFF(%eax), %eax
+        addl foo at GOTNTPOFF(%ebx), %ecx
 
         .section	.rodata.str1.16,"aMS", at progbits,1
 .Lfoo: