From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Mon, 30 Oct 2017 17:26:12 +0000 (+0000)
Subject: Skip abs symbols when handling copy reloc aliases.
X-Git-Tag: llvmorg-6.0.0-rc1~4584
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=566dbdc2fda38f69f325c7cfcee3c52caf793a85;p=platform%2Fupstream%2Fllvm.git

Skip abs symbols when handling copy reloc aliases.

Since we now only check st_value, we have to consider the case where
the section index is special.

llvm-svn: 316928
---

diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index 92bd9bc..31ff4fe 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -469,7 +469,8 @@ static std::vector<SharedSymbol *> getSymbolsAt(SharedSymbol *SS) {
 
   std::vector<SharedSymbol *> Ret;
   for (const Elf_Sym &S : File->getGlobalELFSyms()) {
-    if (S.st_shndx == 0 || S.st_value != SS->Value)
+    if (S.st_shndx == SHN_UNDEF || S.st_shndx == SHN_ABS ||
+        S.st_value != SS->Value)
       continue;
     StringRef Name = check(S.getName(File->getStringTable()));
     SymbolBody *Sym = Symtab->find(Name);
diff --git a/lld/test/ELF/Inputs/copy-rel-abs.s b/lld/test/ELF/Inputs/copy-rel-abs.s
new file mode 100644
index 0000000..66d0880
--- /dev/null
+++ b/lld/test/ELF/Inputs/copy-rel-abs.s
@@ -0,0 +1,13 @@
+        .global foo
+        .type foo, @object
+        .size foo, 4
+foo:
+        .weak bar
+        .type bar, @object
+        .size bar, 4
+bar:
+        .long 42
+
+        .weak zed
+        .type zed, @object
+        zed = 0x1000
diff --git a/lld/test/ELF/copy-rel-abs.s b/lld/test/ELF/copy-rel-abs.s
new file mode 100644
index 0000000..37a2c43
--- /dev/null
+++ b/lld/test/ELF/copy-rel-abs.s
@@ -0,0 +1,47 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/copy-rel-abs.s -o %t1.o
+// RUN: ld.lld --hash-style=gnu -shared %t1.o -o %t1.so
+// RUN: llvm-readelf --dyn-symbols %t1.so | FileCheck --check-prefix=SYMS %s
+
+// The symbols have the same st_value, but one is ABS.
+// SYMS: 0000000000001000 {{.*}}   4 bar
+// SYMS: 0000000000001000 {{.*}}   4 foo
+// SYMS: 0000000000001000 {{.*}} ABS zed
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
+// RUN: ld.lld %t2.o %t1.so -o %t2
+// RUN: llvm-readobj --dyn-symbols %t2 | FileCheck %s
+
+// CHECK:      DynamicSymbols [
+// CHECK-NEXT:   Symbol {
+// CHECK-NEXT:     Name:
+// CHECK-NEXT:     Value:
+// CHECK-NEXT:     Size:
+// CHECK-NEXT:     Binding:
+// CHECK-NEXT:     Type:
+// CHECK-NEXT:     Other:
+// CHECK-NEXT:     Section:
+// CHECK-NEXT:   }
+// CHECK-NEXT:   Symbol {
+// CHECK-NEXT:     Name: foo
+// CHECK-NEXT:     Value:
+// CHECK-NEXT:     Size:
+// CHECK-NEXT:     Binding:
+// CHECK-NEXT:     Type:
+// CHECK-NEXT:     Other:
+// CHECK-NEXT:     Section: .bss.rel.ro
+// CHECK-NEXT:   }
+// CHECK-NEXT:   Symbol {
+// CHECK-NEXT:     Name: bar
+// CHECK-NEXT:     Value:
+// CHECK-NEXT:     Size:
+// CHECK-NEXT:     Binding:
+// CHECK-NEXT:     Type:
+// CHECK-NEXT:     Other:
+// CHECK-NEXT:     Section: .bss.rel.ro
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]
+
+.global _start
+_start:
+.quad foo