[llvm-branch-commits] [llvm-branch] r128032 - in /llvm/branches/release_29: ./ lib/MC/MCELFStreamer.cpp test/MC/ELF/tls-i386.s

[Bill Wendling]

Author: void
Date: Mon Mar 21 17:49:24 2011
New Revision: 128032

URL: http://llvm.org/viewvc/llvm-project?rev=128032&view=rev
Log:
--- Merging r127780 into '.':
U    test/MC/ELF/tls-i386.s
U    lib/MC/MCELFStreamer.cpp


Modified:
    llvm/branches/release_29/   (props changed)
    llvm/branches/release_29/lib/MC/MCELFStreamer.cpp
    llvm/branches/release_29/test/MC/ELF/tls-i386.s

Propchange: llvm/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 17:49:24 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:127241,127263-127264,127298,127325,127350-127351,127441,127464
+/llvm/trunk:127241,127263-127264,127298,127325,127350-127351,127441,127464,127780

Modified: llvm/branches/release_29/lib/MC/MCELFStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/lib/MC/MCELFStreamer.cpp?rev=128032&r1=128031&r2=128032&view=diff
==============================================================================
--- llvm/branches/release_29/lib/MC/MCELFStreamer.cpp (original)
+++ llvm/branches/release_29/lib/MC/MCELFStreamer.cpp Mon Mar 21 17:49:24 2011
@@ -291,15 +291,18 @@
     switch (symRef.getKind()) {
     default:
       return;
+    case MCSymbolRefExpr::VK_GOTTPOFF:
+    case MCSymbolRefExpr::VK_INDNTPOFF:
     case MCSymbolRefExpr::VK_NTPOFF:
     case MCSymbolRefExpr::VK_GOTNTPOFF:
     case MCSymbolRefExpr::VK_TLSGD:
+    case MCSymbolRefExpr::VK_TLSLD:
     case MCSymbolRefExpr::VK_TLSLDM:
     case MCSymbolRefExpr::VK_TPOFF:
     case MCSymbolRefExpr::VK_DTPOFF:
-    case MCSymbolRefExpr::VK_GOTTPOFF:
-    case MCSymbolRefExpr::VK_TLSLD:
     case MCSymbolRefExpr::VK_ARM_TLSGD:
+    case MCSymbolRefExpr::VK_ARM_TPOFF:
+    case MCSymbolRefExpr::VK_ARM_GOTTPOFF:
       break;
     }
     MCSymbolData &SD = getAssembler().getOrCreateSymbolData(symRef.getSymbol());

Modified: llvm/branches/release_29/test/MC/ELF/tls-i386.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/MC/ELF/tls-i386.s?rev=128032&r1=128031&r2=128032&view=diff
==============================================================================
--- llvm/branches/release_29/test/MC/ELF/tls-i386.s (original)
+++ llvm/branches/release_29/test/MC/ELF/tls-i386.s Mon Mar 21 17:49:24 2011
@@ -8,6 +8,7 @@
         movl    foo4 at TLSLDM(%eax), %eax
         movl    foo5 at TPOFF(%eax), %eax
         movl    foo6 at DTPOFF(%eax), %eax
+        movl    foo7 at INDNTPOFF, %eax
 
 // CHECK:       (('st_name', 0x00000001) # 'foo1'
 // CHECK-NEXT:   ('st_value', 0x00000000)
@@ -62,3 +63,12 @@
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
+// CHECK-NEXT:  # Symbol 0x0000000b
+// CHECK-NEXT:  (('st_name', 0x0000001f) # 'foo7'
+// CHECK-NEXT:   ('st_value', 0x00000000)
+// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_bind', 0x00000001)
+// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_other', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ),