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

[Rafael Espindola]

Author: rafael
Date: Tue Oct  5 17:26:43 2010
New Revision: 115699

URL: http://llvm.org/viewvc/llvm-project?rev=115699&view=rev
Log:
Implement more alias cases.

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

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=115699&r1=115698&r2=115699&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Tue Oct  5 17:26:43 2010
@@ -807,9 +807,20 @@
     MSD.SymbolData = it;
     MSD.StringIndex = Entry;
 
+    // FIXME: There is duplicated code with the local case.
     if (it->isCommon()) {
       MSD.SectionIndex = ELF::SHN_COMMON;
       ExternalSymbolData.push_back(MSD);
+    } else if (Symbol.isVariable()) {
+      const MCExpr *Value = Symbol.getVariableValue();
+      assert (Value->getKind() == MCExpr::SymbolRef && "Unimplemented");
+      const MCSymbolRefExpr *Ref = static_cast<const MCSymbolRefExpr*>(Value);
+      const MCSymbol &RefSymbol = Ref->getSymbol();
+      if (RefSymbol.isDefined()) {
+        MSD.SectionIndex = SectionIndexMap.lookup(&RefSymbol.getSection());
+        assert(MSD.SectionIndex && "Invalid section index!");
+        ExternalSymbolData.push_back(MSD);
+      }
     } else if (Symbol.isUndefined()) {
       MSD.SectionIndex = ELF::SHN_UNDEF;
       // FIXME: Undefined symbols are global, but this is the first place we

Modified: llvm/trunk/test/MC/ELF/alias.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/alias.s?rev=115699&r1=115698&r2=115699&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/alias.s (original)
+++ llvm/trunk/test/MC/ELF/alias.s Tue Oct  5 17:26:43 2010
@@ -3,6 +3,13 @@
 foo:
 bar = foo
 
+        .globl	foo2
+foo2 = bar2
+
+foo3:
+	.globl	bar3
+bar3 = foo3
+
 // CHECK:       # Symbol 1
 // CHECK-NEXT:  (('st_name', 5) # 'bar'
 // CHECK-NEXT:   ('st_bind', 0)
@@ -20,3 +27,33 @@
 // CHECK-NEXT:   ('st_shndx', 1)
 // CHECK-NEXT:   ('st_value', 0)
 // CHECK-NEXT:   ('st_size', 0)
+// CHECK:       # Symbol 3
+// CHECK-NEXT:  (('st_name', 9) # 'foo3'
+// CHECK-NEXT:   ('st_bind', 0)
+// CHECK-NEXT:   ('st_type', 0)
+// CHECK-NEXT:   ('st_other', 0)
+// CHECK-NEXT:   ('st_shndx', 1)
+// CHECK-NEXT:   ('st_value', 0)
+// CHECK-NEXT:   ('st_size', 0)
+// CHECK:       # Symbol 4
+// CHECK-NEXT:  (('st_name', 0) # ''
+// CHECK:       # Symbol 5
+// CHECK-NEXT:  (('st_name', 0) # ''
+// CHECK:       # Symbol 6
+// CHECK-NEXT:  (('st_name', 0) # ''
+// CHECK:       # Symbol 7
+// CHECK-NEXT:  (('st_name', 24) # 'bar3'
+// CHECK-NEXT:   ('st_bind', 1)
+// CHECK-NEXT:   ('st_type', 0)
+// CHECK-NEXT:   ('st_other', 0)
+// CHECK-NEXT:   ('st_shndx', 1)
+// CHECK-NEXT:   ('st_value', 0)
+// CHECK-NEXT:   ('st_size', 0)
+// CHECK:       # Symbol 8
+// CHECK-NEXT:  (('st_name', 19) # 'bar2'
+// CHECK-NEXT:   ('st_bind', 1)
+// CHECK-NEXT:   ('st_type', 0)
+// CHECK-NEXT:   ('st_other', 0)
+// CHECK-NEXT:   ('st_shndx', 0)
+// CHECK-NEXT:   ('st_value', 0)
+// CHECK-NEXT:   ('st_size', 0)