[llvm-branch-commits] [llvm-branch] r226203 - Merging r226182:

[Hans Wennborg]

Author: hans
Date: Thu Jan 15 14:56:12 2015
New Revision: 226203

URL: http://llvm.org/viewvc/llvm-project?rev=226203&view=rev
Log:
Merging r226182:
------------------------------------------------------------------------
r226182 | joerg | 2015-01-15 09:59:02 -0800 (Thu, 15 Jan 2015) | 2 lines

Support @PLT loads on 32bit x86.

------------------------------------------------------------------------

Modified:
    llvm/branches/release_36/   (props changed)
    llvm/branches/release_36/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp
    llvm/branches/release_36/test/MC/ELF/relocation-386.s

Propchange: llvm/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 15 14:56:12 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075
+/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226182

Modified: llvm/branches/release_36/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp?rev=226203&r1=226202&r2=226203&view=diff
==============================================================================
--- llvm/branches/release_36/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp (original)
+++ llvm/branches/release_36/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp Thu Jan 15 14:56:12 2015
@@ -222,6 +222,9 @@ unsigned X86ELFObjectWriter::GetRelocTyp
         case MCSymbolRefExpr::VK_GOT:
           Type = ELF::R_386_GOT32;
           break;
+        case MCSymbolRefExpr::VK_PLT:
+          Type = ELF::R_386_PLT32;
+          break;
         case MCSymbolRefExpr::VK_GOTOFF:
           Type = ELF::R_386_GOTOFF;
           break;

Modified: llvm/branches/release_36/test/MC/ELF/relocation-386.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/MC/ELF/relocation-386.s?rev=226203&r1=226202&r2=226203&view=diff
==============================================================================
--- llvm/branches/release_36/test/MC/ELF/relocation-386.s (original)
+++ llvm/branches/release_36/test/MC/ELF/relocation-386.s Thu Jan 15 14:56:12 2015
@@ -63,6 +63,8 @@
 // Relocation 28 (und_symbol-bar2) is of type R_386_PC8
 // CHECK-NEXT:     0xA0         R_386_PC8        und_symbol 0x0
 // CHECK-NEXT:     0xA3         R_386_GOTOFF     und_symbol 0x0
+// Relocation 29 (zed at PLT) is of type R_386_PLT32 and uses the symbol
+// CHECK-NEXT:     0xA9         R_386_PLT32      zed 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
@@ -129,6 +131,7 @@ bar2:
         .byte und_symbol-bar2
 
         leal 1 + und_symbol at GOTOFF, %edi
+        movl zed at PLT(%eax), %eax
 
         .section        zedsec,"awT", at progbits
 zed: