[lld] r193481 - [X86_64] Fix the atom that need to be exported.

Shankar Easwaran shankare at codeaurora.org
Sat Oct 26 12:38:38 PDT 2013


Author: shankare
Date: Sat Oct 26 14:38:37 2013
New Revision: 193481

URL: http://llvm.org/viewvc/llvm-project?rev=193481&view=rev
Log:
[X86_64] Fix the atom that need to be exported.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
    lld/trunk/test/elf/undef-from-main-dso.test

Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp?rev=193481&r1=193480&r2=193481&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp Sat Oct 26 14:38:37 2013
@@ -379,7 +379,8 @@ public:
       return obj->second;
 
     auto oa = new (_file._alloc) ObjectAtom(_file);
-    oa->addReference(R_X86_64_COPY, 0, a, 0);
+    // This needs to point to the atom that we just created.
+    oa->addReference(R_X86_64_COPY, 0, oa, 0);
 
     oa->_name = a->name();
     oa->_size = a->size();

Modified: lld/trunk/test/elf/undef-from-main-dso.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/undef-from-main-dso.test?rev=193481&r1=193480&r2=193481&view=diff
==============================================================================
--- lld/trunk/test/elf/undef-from-main-dso.test (original)
+++ lld/trunk/test/elf/undef-from-main-dso.test Sat Oct 26 14:38:37 2013
@@ -19,7 +19,7 @@ RUN: llvm-readobj -relocations -symbols
 
 CHECK:       Relocations [
 CHECK-NEXT:    Section ({{[0-9]+}}) .rela.dyn {
-CHECK-NEXT:      0x{{[1-9A-F][0-9A-F]*}} R_X86_64_COPY x 0x0
+CHECK-NEXT:      0x{{[1-9A-F][0-9A-F]*}} R_X86_64_COPY - 0x0
 CHECK-NEXT:    }
 CHECK-NEXT:  ]
 





More information about the llvm-commits mailing list