RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-03-04 18:38:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "ELFDumper: Unversioned symbols must not have trailing @"

Browse Source 
This reverts commit 8df7a877949e8782a3a28e3ecdb0770c1e444056.

Fixing other repositories and adding changes together.

llvm-svn: 280152
This commit is contained in:
Hemant Kulkarni 2016-08-30 20:42:46 +00:00
parent 39c8e8b0c7
commit 9e43086564
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/tools/llvm-readobj/elf-versioninfo.test
View File

@ -14,15 +14,15 @@ CHECK-NEXT: Link: 1
CHECK-NEXT: Symbols [
CHECK-NEXT: Symbol {
CHECK-NEXT: Version: 0
CHECK-NEXT: Name:
CHECK-NEXT: Name: @
CHECK-NEXT: }
CHECK-NEXT: Symbol {
CHECK-NEXT: Version: 1
CHECK-NEXT: Name: _end
CHECK-NEXT: Name: _end@
CHECK-NEXT: }
CHECK-NEXT: Symbol {
CHECK-NEXT: Version: 1
CHECK-NEXT: Name: _edata
CHECK-NEXT: Name: _edata@
CHECK-NEXT: }
CHECK-NEXT: Symbol {
CHECK-NEXT: Version: 3
@ -30,7 +30,7 @@ CHECK-NEXT: Name: goo@@VERSION2
CHECK-NEXT: }
CHECK-NEXT: Symbol {
CHECK-NEXT: Version: 1
CHECK-NEXT: Name: __bss_start
CHECK-NEXT: Name: __bss_start@
CHECK-NEXT: }
CHECK-NEXT: Symbol {
CHECK-NEXT: Version: 2

18
test/tools/llvm-readobj/mips-got.test
View File

@ -52,7 +52,7 @@ GOT-EXE-NEXT: Initial: 0x0
GOT-EXE-NEXT: Value: 0x0
GOT-EXE-NEXT: Type: Function (0x2)
GOT-EXE-NEXT: Section: Undefined (0x0)
GOT-EXE-NEXT: Name: __gmon_start__ (1)
GOT-EXE-NEXT: Name: __gmon_start__@ (1)
GOT-EXE-NEXT: }
GOT-EXE-NEXT: ]
GOT-EXE-NEXT: Number of TLS and multi-GOT entries: 0
@ -124,7 +124,7 @@ GOT-SO-NEXT: Initial: 0x0
GOT-SO-NEXT: Value: 0x0
GOT-SO-NEXT: Type: None (0x0)
GOT-SO-NEXT: Section: Undefined (0x0)
GOT-SO-NEXT: Name: _ITM_registerTMCloneTable (87)
GOT-SO-NEXT: Name: _ITM_registerTMCloneTable@ (87)
GOT-SO-NEXT: }
GOT-SO-NEXT: Entry {
GOT-SO-NEXT: Address: 0x1090C
@ -133,7 +133,7 @@ GOT-SO-NEXT: Initial: 0x0
GOT-SO-NEXT: Value: 0x0
GOT-SO-NEXT: Type: None (0x0)
GOT-SO-NEXT: Section: Undefined (0x0)
GOT-SO-NEXT: Name: _Jv_RegisterClasses (128)
GOT-SO-NEXT: Name: _Jv_RegisterClasses@ (128)
GOT-SO-NEXT: }
GOT-SO-NEXT: Entry {
GOT-SO-NEXT: Address: 0x10910
@ -142,7 +142,7 @@ GOT-SO-NEXT: Initial: 0x0
GOT-SO-NEXT: Value: 0x0
GOT-SO-NEXT: Type: Function (0x2)
GOT-SO-NEXT: Section: Undefined (0x0)
GOT-SO-NEXT: Name: __gmon_start__ (23)
GOT-SO-NEXT: Name: __gmon_start__@ (23)
GOT-SO-NEXT: }
GOT-SO-NEXT: Entry {
GOT-SO-NEXT: Address: 0x10914
@ -160,7 +160,7 @@ GOT-SO-NEXT: Initial: 0x0
GOT-SO-NEXT: Value: 0x0
GOT-SO-NEXT: Type: None (0x0)
GOT-SO-NEXT: Section: Undefined (0x0)
GOT-SO-NEXT: Name: _ITM_deregisterTMCloneTable (59)
GOT-SO-NEXT: Name: _ITM_deregisterTMCloneTable@ (59)
GOT-SO-NEXT: }
GOT-SO-NEXT: Entry {
GOT-SO-NEXT: Address: 0x1091C
@ -256,7 +256,7 @@ GOT-TLS-NEXT: Initial: 0x0
GOT-TLS-NEXT: Value: 0x0
GOT-TLS-NEXT: Type: None (0x0)
GOT-TLS-NEXT: Section: Undefined (0x0)
GOT-TLS-NEXT: Name: _ITM_registerTMCloneTable (78)
GOT-TLS-NEXT: Name: _ITM_registerTMCloneTable@ (78)
GOT-TLS-NEXT: }
GOT-TLS-NEXT: Entry {
GOT-TLS-NEXT: Address: 0x10C70
@ -265,7 +265,7 @@ GOT-TLS-NEXT: Initial: 0x0
GOT-TLS-NEXT: Value: 0x0
GOT-TLS-NEXT: Type: None (0x0)
GOT-TLS-NEXT: Section: Undefined (0x0)
GOT-TLS-NEXT: Name: _Jv_RegisterClasses (119)
GOT-TLS-NEXT: Name: _Jv_RegisterClasses@ (119)
GOT-TLS-NEXT: }
GOT-TLS-NEXT: Entry {
GOT-TLS-NEXT: Address: 0x10C78
@ -274,7 +274,7 @@ GOT-TLS-NEXT: Initial: 0x0
GOT-TLS-NEXT: Value: 0x0
GOT-TLS-NEXT: Type: Function (0x2)
GOT-TLS-NEXT: Section: Undefined (0x0)
GOT-TLS-NEXT: Name: __gmon_start__ (23)
GOT-TLS-NEXT: Name: __gmon_start__@ (23)
GOT-TLS-NEXT: }
GOT-TLS-NEXT: Entry {
GOT-TLS-NEXT: Address: 0x10C80
@ -292,7 +292,7 @@ GOT-TLS-NEXT: Initial: 0x0
GOT-TLS-NEXT: Value: 0x0
GOT-TLS-NEXT: Type: None (0x0)
GOT-TLS-NEXT: Section: Undefined (0x0)
GOT-TLS-NEXT: Name: _ITM_deregisterTMCloneTable (50)
GOT-TLS-NEXT: Name: _ITM_deregisterTMCloneTable@ (50)
GOT-TLS-NEXT: }
GOT-TLS-NEXT: Entry {
GOT-TLS-NEXT: Address: 0x10C90

3
tools/llvm-readobj/ELFDumper.cpp
View File

@ -705,9 +705,6 @@ std::string ELFDumper<ELFT>::getFullSymbolName(const Elf_Sym *Symbol,
bool IsDefault;
StringRef Version = getSymbolVersion(StrTable, &*Symbol, IsDefault);
// Unversioned symbol must not have any suffix @
if (!IsDefault && Version == "")
return FullSymbolName;
FullSymbolName += (IsDefault ? "@@" : "@");
FullSymbolName += Version;
return FullSymbolName;