diff --git a/llvm/docs/CommandGuide/llvm-nm.rst b/llvm/docs/CommandGuide/llvm-nm.rst
--- a/llvm/docs/CommandGuide/llvm-nm.rst
+++ b/llvm/docs/CommandGuide/llvm-nm.rst
@@ -126,6 +126,20 @@
Use BSD output format. Alias for ``--format=bsd``.
+.. option:: -X
+
+ Specify the type of XCOFF object file, ELF object file, or IR object file input
+ from command line or from archive files that llvm-nm should examine. The
+ mode must be one of the following:
+ 32
+ Process only 32-bit object files.
+ 64
+ Process only 64-bit object files.
+ 32_64
+ Process both 32-bit and 64-bit object files.
+ any
+ Process all the supported object files.
+
.. option:: --debug-syms, -a
Show all symbols, even those usually suppressed.
diff --git a/llvm/test/tools/llvm-nm/XCOFF/option-X.test b/llvm/test/tools/llvm-nm/XCOFF/option-X.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-nm/XCOFF/option-X.test
@@ -0,0 +1,95 @@
+## Test the "-X" option.
+## The option specifies the type of object file to examine.
+
+# RUN: yaml2obj --docnum=1 %s -o %t32.o
+# RUN: yaml2obj --docnum=2 %s -o %t64.o
+# RUN: rm -rf %t.a
+# RUN: llvm-ar -q -c %t.a %t32.o %t64.o
+
+# RUN: llvm-nm -X32 %t32.o | FileCheck --check-prefixes=BIT32 %s --implicit-check-not={{.}}
+# RUN: llvm-nm -X32 %t.a | \
+# RUN: FileCheck --check-prefixes=ARC32,BIT32 %s -DFILE=%basename_t --implicit-check-not={{.}}
+# ARC32: [[FILE]].tmp32.o:
+# BIT32: 00000000 D var32
+
+# RUN: llvm-nm -X64 %t64.o | FileCheck --check-prefixes=BIT64 %s --implicit-check-not={{.}}
+# RUN: llvm-nm -X64 %t.a | \
+# RUN: FileCheck --check-prefixes=ARC64,BIT64 -DFILE=%basename_t %s --implicit-check-not={{.}}
+# ARC64: [[FILE]].tmp64.o:
+# BIT64: 0000000000000000 D var64
+
+# RUN: llvm-nm %t32.o %t64.o | \
+# RUN: FileCheck --check-prefixes=BOTH %s -DFILE32=%t32.o -DFILE64=%t64.o --match-full-lines
+# RUN: llvm-nm -X32_64 %t32.o %t64.o | \
+# RUN: FileCheck --check-prefixes=BOTH %s -DFILE32=%t32.o -DFILE64=%t64.o --match-full-lines
+# RUN: llvm-nm -Xany %t32.o %t64.o | \
+# RUN: FileCheck --check-prefixes=BOTH %s -DFILE32=%t32.o -DFILE64=%t64.o --match-full-lines
+
+# BOTH: [[FILE32]]:
+# BOTH-NEXT: 00000000 D var32
+# BOTH-EMPTY:
+# BOTH-NEXT: [[FILE64]]:
+# BOTH-NEXT: 0000000000000000 D var64
+
+# RUN: llvm-nm %t.a | \
+# RUN: FileCheck --check-prefixes=ARCHIVE-BOTH -DFILE=%basename_t --match-full-lines %s
+# RUN: llvm-nm -X32_64 %t.a | \
+# RUN: FileCheck --check-prefixes=ARCHIVE-BOTH -DFILE=%basename_t --match-full-lines %s
+# RUN: llvm-nm -Xany %t.a | \
+# RUN: FileCheck --check-prefixes=ARCHIVE-BOTH -DFILE=%basename_t --match-full-lines %s
+
+# ARCHIVE-BOTH: [[FILE]].tmp32.o:
+# ARCHIVE-BOTH-NEXT: 00000000 D var32{{[[:space:]]}}
+# ARCHIVE-BOTH-NEXT: [[FILE]].tmp64.o:
+# ARCHIVE-BOTH-NEXT: 0000000000000000 D var64
+
+# RUN: llvm-nm -X64 %t32.o | count 0
+# RUN: llvm-nm -X32 %t64.o | count 0
+
+--- !XCOFF
+FileHeader:
+ MagicNumber: 0x1DF
+ Flags: 0x0002
+AuxiliaryHeader:
+ Magic: 0x10B
+ Version: 0x2
+ TextSectionSize: 0x280
+ DataSectionSize: 0x90
+Sections:
+ - Name: .text
+ Flags: [ STYP_TEXT ]
+ - Name: .data
+ Flags: [ STYP_DATA ]
+Symbols:
+ - Name: var32
+ Section: .data
+ Type: 0x4000
+ StorageClass: C_EXT
+ AuxEntries:
+ - Type: AUX_CSECT
+ SymbolAlignmentAndType: 0x09
+ StorageMappingClass: XMC_RW
+
+--- !XCOFF
+FileHeader:
+ MagicNumber: 0x1F7
+ Flags: 0x0002
+AuxiliaryHeader:
+ Magic: 0x10B
+ Version: 0x2
+ TextSectionSize: 0x280
+ DataSectionSize: 0x90
+Sections:
+ - Name: .text
+ Flags: [ STYP_TEXT ]
+ - Name: .data
+ Flags: [ STYP_DATA ]
+Symbols:
+ - Name: var64
+ Section: .data
+ Type: 0x3000
+ StorageClass: C_EXT
+ AuxEntries:
+ - Type: AUX_CSECT
+ SymbolAlignmentAndType: 0x09
+ StorageMappingClass: XMC_RW
diff --git a/llvm/test/tools/llvm-nm/option-X-elf-bitcode.test b/llvm/test/tools/llvm-nm/option-X-elf-bitcode.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-nm/option-X-elf-bitcode.test
@@ -0,0 +1,75 @@
+## Test the option "-X" for bitcode and ELF object file.
+
+# RUN: llvm-as -o %t32.bc %p/Inputs/bitcode-sym32.ll
+# RUN: llvm-as -o %t64.bc %p/Inputs/bitcode-sym64.ll
+
+# RUN: llvm-nm --format=just-symbols -X32 %t32.bc %t64.bc | \
+# RUN: FileCheck %s -DFILE1=%t32.bc --check-prefixes=BITCODE32 --implicit-check-not={{.}}
+# RUN: llvm-nm --format=just-symbols -X64 %t32.bc %t64.bc | \
+# RUN: FileCheck %s -DFILE2=%t64.bc --check-prefixes=BITCODE64 --implicit-check-not={{.}}
+# RUN: llvm-nm --format=just-symbols %t32.bc %t64.bc | \
+# RUN: FileCheck %s -DFILE1=%t32.bc -DFILE2=%t64.bc --check-prefixes=BITCODE32,BITCODE64
+# RUN: llvm-nm --format=just-symbols -X32_64 %t32.bc %t64.bc | \
+# RUN: FileCheck %s -DFILE1=%t32.bc -DFILE2=%t64.bc --check-prefixes=BITCODE32,BITCODE64
+# RUN: llvm-nm --format=just-symbols -Xany %t32.bc %t64.bc | \
+# RUN: FileCheck %s -DFILE1=%t32.bc -DFILE2=%t64.bc --check-prefixes=BITCODE32,BITCODE64
+
+# BITCODE32: [[FILE1]]:
+# BITCODE32-NEXT: C32
+# BITCODE32-NEXT: foo32
+# BITCODE32-NEXT: undef_var32
+
+# BITCODE64: [[FILE2]]:
+# BITCODE64-NEXT: C64
+# BITCODE64-NEXT: bar64
+# BITCODE64-NEXT: static_var64
+
+# RUN: yaml2obj --docnum=1 %s -o %t_elf32.o
+# RUN: yaml2obj --docnum=2 %s -o %t_elf64.o
+
+# RUN: llvm-nm --format=just-symbols -X32 %t_elf32.o %t_elf64.o | \
+# RUN: FileCheck %s -DFILE32=%t_elf32.o --check-prefixes=ELF32 --implicit-check-not={{.}}
+# RUN: llvm-nm --format=just-symbols -X64 %t_elf32.o %t_elf64.o | \
+# RUN: FileCheck %s -DFILE64=%t_elf64.o --check-prefixes=ELF64 --implicit-check-not={{.}}
+# RUN: llvm-nm --format=just-symbols %t_elf32.o %t_elf64.o | \
+# RUN: FileCheck %s -DFILE32=%t_elf32.o -DFILE64=%t_elf64.o --check-prefixes=ELF32,ELF64
+# RUN: llvm-nm --format=just-symbols -X32_64 %t_elf32.o %t_elf64.o | \
+# RUN: FileCheck %s -DFILE32=%t_elf32.o -DFILE64=%t_elf64.o --check-prefixes=ELF32,ELF64
+# RUN: llvm-nm --format=just-symbols -Xany %t_elf32.o %t_elf64.o | \
+# RUN: FileCheck %s -DFILE32=%t_elf32.o -DFILE64=%t_elf64.o --check-prefixes=ELF32,ELF64
+
+# ELF32: [[FILE32]]:
+# ELF32-NEXT: global_data_symbol32
+
+# ELF64: [[FILE64]]:
+# ELF64-NEXT: global_data_symbol64
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS32
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_386
+Sections:
+ - Name: .data
+ Type: SHT_PROGBITS
+ Flags: [SHF_ALLOC, SHF_WRITE]
+Symbols:
+ - Name: global_data_symbol32
+ Binding: STB_GLOBAL
+ Section: .data
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_AARCH64
+Sections:
+ - Name: .data
+ Type: SHT_PROGBITS
+ Flags: [SHF_ALLOC, SHF_WRITE]
+Symbols:
+ - Name: global_data_symbol64
+ Binding: STB_GLOBAL
+ Section: .data
diff --git a/llvm/test/tools/llvm-nm/option-X-invalid-arg.test b/llvm/test/tools/llvm-nm/option-X-invalid-arg.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-nm/option-X-invalid-arg.test
@@ -0,0 +1,23 @@
+## Test invalid argument for option "-X".
+
+# RUN: yaml2obj --docnum=1 %s -o %t_elf32.o
+
+# RUN: not llvm-nm --format=just-symbols -X33 %t_elf32.o 2>&1 | FileCheck %s
+
+# CHECK: llvm-nm{{(\.exe)?}}: error: : -X value should be one of: 32, 64, 32_64, (default) any
+# CHECK-NEXT: global_data_symbol32
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS32
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_386
+Sections:
+ - Name: .data
+ Type: SHT_PROGBITS
+ Flags: [SHF_ALLOC, SHF_WRITE]
+Symbols:
+ - Name: global_data_symbol32
+ Binding: STB_GLOBAL
+ Section: .data
diff --git a/llvm/tools/llvm-nm/Opts.td b/llvm/tools/llvm-nm/Opts.td
--- a/llvm/tools/llvm-nm/Opts.td
+++ b/llvm/tools/llvm-nm/Opts.td
@@ -13,6 +13,7 @@
def : Separate<["--"], name>, Alias<!cast<Joined>(NAME #_EQ)>;
}
+def X : JoinedOrSeparate<["-"], "X">, HelpText<"Specifies the type of object file to examine. The value must be one of : 32, 64, 32_64, any (default)">;
def debug_syms : FF<"debug-syms", "Show all symbols, even debugger only">;
def defined_only : FF<"defined-only", "Show only defined symbols">;
defm demangle : BB<"demangle", "Demangle C++ symbol names", "Don't demangle symbol names">;
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -84,9 +84,11 @@
};
enum OutputFormatTy { bsd, sysv, posix, darwin, just_symbols };
+enum class BitModeTy { Bit32, Bit64, Bit32_64, Any };
} // namespace
static bool ArchiveMap;
+static BitModeTy BitMode;
static bool DebugSyms;
static bool DefinedOnly;
static bool Demangle;
@@ -1756,9 +1758,23 @@
}
}
+static bool shouldDump(SymbolicFile &Obj) {
+ // The -X option is currently only implemented for XCOFF, ELF, and IR object
+ // files. The option isn't fundamentally impossible with other formats, just
+ // isn't implemented.
+ if (!isa<XCOFFObjectFile>(Obj) && !isa<ELFObjectFileBase>(Obj) &&
+ !isa<IRObjectFile>(Obj))
+ return true;
+
+ return isSymbolList64Bit(Obj) ? BitMode != BitModeTy::Bit32
+ : BitMode != BitModeTy::Bit64;
+}
+
static void dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName,
StringRef ArchiveName = {},
StringRef ArchitectureName = {}) {
+ if (!shouldDump(Obj))
+ return;
auto Symbols = Obj.symbols();
std::vector<VersionEntry> SymbolVersions;
if (DynamicSyms) {
@@ -1973,7 +1989,7 @@
}
if (!checkMachOAndArchFlags(O, Filename))
return;
- if (!PrintFileName && !ExportSymbols) {
+ if (!PrintFileName && !ExportSymbols && shouldDump(*O)) {
outs() << "\n";
if (isa<MachOObjectFile>(O)) {
outs() << Filename << "(" << O->getFileName() << ")";
@@ -2325,6 +2341,18 @@
NoDyldInfo = Args.hasArg(OPT_no_dyldinfo);
// XCOFF specific options.
+ StringRef Mode = Args.getLastArgValue(OPT_X, "any");
+ if (Mode == "32")
+ BitMode = BitModeTy::Bit32;
+ else if (Mode == "64")
+ BitMode = BitModeTy::Bit64;
+ else if (Mode == "32_64")
+ BitMode = BitModeTy::Bit32_64;
+ else if (Mode == "any")
+ BitMode = BitModeTy::Any;
+ else
+ error("-X value should be one of: 32, 64, 32_64, (default) any");
+
NoRsrc = Args.hasArg(OPT_no_rsrc);
// llvm-nm only reads binary files.