replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r209235 as it broke two tests: 

Failing Tests (2):
	    LLVM :: ExecutionEngine/MCJIT/stubs-sm-pic.ll
	    LLVM :: ExecutionEngine/MCJIT/stubs.ll

llvm-svn: 209236
This commit is contained in:
Kevin Enderby 2014-05-20 21:10:15 +00:00
parent 1126d02c0c
commit fcbed5af67
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/Object/MachOObjectFile.cpp
View File

@ -472,18 +472,10 @@ error_code MachOObjectFile::getSymbolAddress(DataRefImpl Symb,
uint64_t &Res) const { uint64_t &Res) const {
if (is64Bit()) { if (is64Bit()) {
MachO::nlist_64 Entry = getSymbol64TableEntry(Symb); MachO::nlist_64 Entry = getSymbol64TableEntry(Symb);
if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF && Res = Entry.n_value;
Entry.n_value == 0)
Res = UnknownAddressOrSize;
else
Res = Entry.n_value;
} else { } else {
MachO::nlist Entry = getSymbolTableEntry(Symb); MachO::nlist Entry = getSymbolTableEntry(Symb);
if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF && Res = Entry.n_value;
Entry.n_value == 0)
Res = UnknownAddressOrSize;
else
Res = Entry.n_value;
} }
return object_error::success; return object_error::success;
} }

8
llvm/test/Object/nm-trivial-object.test
View File

@ -55,14 +55,14 @@ WEAK-ELF64: 0000000000000000 V x2
ABSOLUTE-ELF64: 0000000000000123 a a1 ABSOLUTE-ELF64: 0000000000000123 a a1
ABSOLUTE-ELF64: 0000000000000123 A a2 ABSOLUTE-ELF64: 0000000000000123 A a2
macho: U _SomeOtherFunction macho: 00000000 U _SomeOtherFunction
macho: 00000000 T _main macho: 00000000 T _main
macho: U _puts macho: 00000000 U _puts
macho64: 0000000000000028 s L_.str macho64: 0000000000000028 s L_.str
macho64: U _SomeOtherFunction macho64: 0000000000000000 U _SomeOtherFunction
macho64: 0000000000000000 T _main macho64: 0000000000000000 T _main
macho64: U _puts macho64: 0000000000000000 U _puts
Test that nm uses addresses even with ELF .o files. Test that nm uses addresses even with ELF .o files.

2
llvm/test/Object/nm-universal-binary.test
View File

@ -13,7 +13,7 @@ CHECK-AR: 0000000000000068 s EH_frame0
CHECK-AR: 000000000000003b s L_.str CHECK-AR: 000000000000003b s L_.str
CHECK-AR: 0000000000000000 T _main CHECK-AR: 0000000000000000 T _main
CHECK-AR: 0000000000000080 S _main.eh CHECK-AR: 0000000000000080 S _main.eh
CHECK-AR: U _printf CHECK-AR: 0000000000000000 U _printf
CHECK-AR: macho-universal-archive.x86_64.i386:i386:foo.o: CHECK-AR: macho-universal-archive.x86_64.i386:i386:foo.o:
CHECK-AR: 00000008 S _bar CHECK-AR: 00000008 S _bar
CHECK-AR: 00000000 T _foo CHECK-AR: 00000000 T _foo