From 1126d02c0ca06557dffdd1cf870693f2647bdc53 Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Tue, 20 May 2014 20:32:18 +0000 Subject: [PATCH] =?utf8?q?Update=20MachOObjectFile::getSymbolAddress=20so?= =?utf8?q?=20it=20returns=20UnknownAddressOrSize=20for=20undefined=20symbo?= =?utf8?q?ls.=20=20Allowing=20llvm-nm=20to=20print=20spaces=20instead=20of?= =?utf8?q?=200=E2=80=99s=20for=20the=20value=20of=20undefined=20symbols=20?= =?utf8?q?in=20Mach-O=20files.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit llvm-svn: 209235 --- llvm/lib/Object/MachOObjectFile.cpp | 12 ++++++++++-- llvm/test/Object/nm-trivial-object.test | 8 ++++---- llvm/test/Object/nm-universal-binary.test | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 0951460..9c581d3 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -472,10 +472,18 @@ error_code MachOObjectFile::getSymbolAddress(DataRefImpl Symb, uint64_t &Res) const { if (is64Bit()) { MachO::nlist_64 Entry = getSymbol64TableEntry(Symb); - Res = Entry.n_value; + if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF && + Entry.n_value == 0) + Res = UnknownAddressOrSize; + else + Res = Entry.n_value; } else { MachO::nlist Entry = getSymbolTableEntry(Symb); - Res = Entry.n_value; + if ((Entry.n_type & MachO::N_TYPE) == MachO::N_UNDF && + Entry.n_value == 0) + Res = UnknownAddressOrSize; + else + Res = Entry.n_value; } return object_error::success; } diff --git a/llvm/test/Object/nm-trivial-object.test b/llvm/test/Object/nm-trivial-object.test index 1117492..20ac662 100644 --- a/llvm/test/Object/nm-trivial-object.test +++ b/llvm/test/Object/nm-trivial-object.test @@ -55,14 +55,14 @@ WEAK-ELF64: 0000000000000000 V x2 ABSOLUTE-ELF64: 0000000000000123 a a1 ABSOLUTE-ELF64: 0000000000000123 A a2 -macho: 00000000 U _SomeOtherFunction +macho: U _SomeOtherFunction macho: 00000000 T _main -macho: 00000000 U _puts +macho: U _puts macho64: 0000000000000028 s L_.str -macho64: 0000000000000000 U _SomeOtherFunction +macho64: U _SomeOtherFunction macho64: 0000000000000000 T _main -macho64: 0000000000000000 U _puts +macho64: U _puts Test that nm uses addresses even with ELF .o files. diff --git a/llvm/test/Object/nm-universal-binary.test b/llvm/test/Object/nm-universal-binary.test index faf4812..c20c733 100644 --- a/llvm/test/Object/nm-universal-binary.test +++ b/llvm/test/Object/nm-universal-binary.test @@ -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: 0000000000000000 U _printf +CHECK-AR: U _printf CHECK-AR: macho-universal-archive.x86_64.i386:i386:foo.o: CHECK-AR: 00000008 S _bar CHECK-AR: 00000000 T _foo -- 2.7.4