[llvm] r209236 - Revert r209235 as it broke two tests:
Kevin Enderby
enderby at apple.com
Tue May 20 14:10:16 PDT 2014
Author: enderby
Date: Tue May 20 16:10:15 2014
New Revision: 209236
URL: http://llvm.org/viewvc/llvm-project?rev=209236&view=rev
Log:
Revert r209235 as it broke two tests:
Failing Tests (2):
LLVM :: ExecutionEngine/MCJIT/stubs-sm-pic.ll
LLVM :: ExecutionEngine/MCJIT/stubs.ll
Modified:
llvm/trunk/lib/Object/MachOObjectFile.cpp
llvm/trunk/test/Object/nm-trivial-object.test
llvm/trunk/test/Object/nm-universal-binary.test
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=209236&r1=209235&r2=209236&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Tue May 20 16:10:15 2014
@@ -472,18 +472,10 @@ error_code MachOObjectFile::getSymbolAdd
uint64_t &Res) const {
if (is64Bit()) {
MachO::nlist_64 Entry = getSymbol64TableEntry(Symb);
- if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF &&
- Entry.n_value == 0)
- Res = UnknownAddressOrSize;
- else
- Res = Entry.n_value;
+ Res = Entry.n_value;
} else {
MachO::nlist Entry = getSymbolTableEntry(Symb);
- if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF &&
- Entry.n_value == 0)
- Res = UnknownAddressOrSize;
- else
- Res = Entry.n_value;
+ Res = Entry.n_value;
}
return object_error::success;
}
Modified: llvm/trunk/test/Object/nm-trivial-object.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-trivial-object.test?rev=209236&r1=209235&r2=209236&view=diff
==============================================================================
--- llvm/trunk/test/Object/nm-trivial-object.test (original)
+++ llvm/trunk/test/Object/nm-trivial-object.test Tue May 20 16:10:15 2014
@@ -55,14 +55,14 @@ WEAK-ELF64: 0000000000000000 V x2
ABSOLUTE-ELF64: 0000000000000123 a a1
ABSOLUTE-ELF64: 0000000000000123 A a2
-macho: U _SomeOtherFunction
+macho: 00000000 U _SomeOtherFunction
macho: 00000000 T _main
-macho: U _puts
+macho: 00000000 U _puts
macho64: 0000000000000028 s L_.str
-macho64: U _SomeOtherFunction
+macho64: 0000000000000000 U _SomeOtherFunction
macho64: 0000000000000000 T _main
-macho64: U _puts
+macho64: 0000000000000000 U _puts
Test that nm uses addresses even with ELF .o files.
Modified: llvm/trunk/test/Object/nm-universal-binary.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-universal-binary.test?rev=209236&r1=209235&r2=209236&view=diff
==============================================================================
--- llvm/trunk/test/Object/nm-universal-binary.test (original)
+++ llvm/trunk/test/Object/nm-universal-binary.test Tue May 20 16:10:15 2014
@@ -13,7 +13,7 @@ CHECK-AR: 0000000000000068 s EH_frame0
CHECK-AR: 000000000000003b s L_.str
CHECK-AR: 0000000000000000 T _main
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: 00000008 S _bar
CHECK-AR: 00000000 T _foo
More information about the llvm-commits
mailing list