maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Prefer symbols from .o over .so. 

This matches the behavior of gold and bfd ld.

llvm-svn: 258102
This commit is contained in:
Rafael Espindola 2016-01-18 23:54:05 +00:00
parent 3f4f6f3ed6
commit 0bc0c02387
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/Symbols.cpp
View File

@ -39,8 +39,9 @@ static uint8_t getMinVisibility(uint8_t VA, uint8_t VB) {
template <class ELFT> int SymbolBody::compare(SymbolBody *Other) {
typedef typename ELFFile<ELFT>::uintX_t uintX_t;
assert(!isLazy() && !Other->isLazy());
std::pair<bool, bool> L(isDefined(), !isWeak());
std::pair<bool, bool> R(Other->isDefined(), !Other->isWeak());
std::tuple<bool, bool, bool> L(isDefined(), !isShared(), !isWeak());
std::tuple<bool, bool, bool> R(Other->isDefined(), !Other->isShared(),
!Other->isWeak());
// Normalize
if (L > R)
@ -54,11 +55,7 @@ template <class ELFT> int SymbolBody::compare(SymbolBody *Other) {
if (L != R)
return -1;
if (!L.first || !L.second)
return 1;
if (isShared())
return -1;
if (Other->isShared())
if (!std::get<0>(L) || !std::get<1>(L) || !std::get<2>(L))
return 1;
if (isCommon()) {
if (!Other->isCommon())

2
lld/test/ELF/Inputs/resolution-shared.s Normal file
View File

@ -0,0 +1,2 @@
.global foo
foo:

15
lld/test/ELF/resolution-shared.s Normal file
View File

@ -0,0 +1,15 @@
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution-shared.s -o %t2.o
// RUN: ld.lld %t2.o -o %t2.so -shared
// RUN: ld.lld %t.o %t2.so -o %t3 -shared
// RUN: llvm-readobj -t %t3 | FileCheck %s
// REQUIRES: x86
.weak foo
foo:
// CHECK: Symbol {
// CHECK: Name: foo
// CHECK-NEXT: Value:
// CHECK-NEXT: Size:
// CHECK-NEXT: Binding: Weak