aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm-project/llvm/tools/llvm-nm/llvm-nm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/llvm-project/llvm/tools/llvm-nm/llvm-nm.cpp')
-rw-r--r--contrib/llvm-project/llvm/tools/llvm-nm/llvm-nm.cpp443
1 files changed, 209 insertions, 234 deletions
diff --git a/contrib/llvm-project/llvm/tools/llvm-nm/llvm-nm.cpp b/contrib/llvm-project/llvm/tools/llvm-nm/llvm-nm.cpp
index c678108807c5..ffb427a3f2bd 100644
--- a/contrib/llvm-project/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/contrib/llvm-project/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -31,6 +31,9 @@
#include "llvm/Object/TapiFile.h"
#include "llvm/Object/TapiUniversal.h"
#include "llvm/Object/Wasm.h"
+#include "llvm/Option/Arg.h"
+#include "llvm/Option/ArgList.h"
+#include "llvm/Option/Option.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Format.h"
@@ -47,192 +50,86 @@ using namespace llvm;
using namespace object;
namespace {
-enum OutputFormatTy { bsd, sysv, posix, darwin };
-
-cl::OptionCategory NMCat("llvm-nm Options");
-
-cl::opt<OutputFormatTy> OutputFormat(
- "format", cl::desc("Specify output format"),
- cl::values(clEnumVal(bsd, "BSD format"), clEnumVal(sysv, "System V format"),
- clEnumVal(posix, "POSIX.2 format"),
- clEnumVal(darwin, "Darwin -m format")),
- cl::init(bsd), cl::cat(NMCat));
-cl::alias OutputFormat2("f", cl::desc("Alias for --format"),
- cl::aliasopt(OutputFormat));
-
-cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input files>"),
- cl::ZeroOrMore);
-
-cl::opt<bool> UndefinedOnly("undefined-only",
- cl::desc("Show only undefined symbols"),
- cl::cat(NMCat));
-cl::alias UndefinedOnly2("u", cl::desc("Alias for --undefined-only"),
- cl::aliasopt(UndefinedOnly), cl::Grouping);
-
-cl::opt<bool> DynamicSyms("dynamic",
- cl::desc("Display the dynamic symbols instead "
- "of normal symbols."),
- cl::cat(NMCat));
-cl::alias DynamicSyms2("D", cl::desc("Alias for --dynamic"),
- cl::aliasopt(DynamicSyms), cl::Grouping);
-
-cl::opt<bool> DefinedOnly("defined-only", cl::desc("Show only defined symbols"),
- cl::cat(NMCat));
-cl::alias DefinedOnly2("U", cl::desc("Alias for --defined-only"),
- cl::aliasopt(DefinedOnly), cl::Grouping);
-
-cl::opt<bool> ExternalOnly("extern-only",
- cl::desc("Show only external symbols"),
- cl::ZeroOrMore, cl::cat(NMCat));
-cl::alias ExternalOnly2("g", cl::desc("Alias for --extern-only"),
- cl::aliasopt(ExternalOnly), cl::Grouping,
- cl::ZeroOrMore);
-
-cl::opt<bool> NoWeakSymbols("no-weak", cl::desc("Show only non-weak symbols"),
- cl::cat(NMCat));
-cl::alias NoWeakSymbols2("W", cl::desc("Alias for --no-weak"),
- cl::aliasopt(NoWeakSymbols), cl::Grouping);
-
-cl::opt<bool> BSDFormat("B", cl::desc("Alias for --format=bsd"), cl::Grouping,
- cl::cat(NMCat));
-cl::opt<bool> POSIXFormat("P", cl::desc("Alias for --format=posix"),
- cl::Grouping, cl::cat(NMCat));
-cl::alias Portability("portability", cl::desc("Alias for --format=posix"),
- cl::aliasopt(POSIXFormat), cl::NotHidden);
-cl::opt<bool> DarwinFormat("m", cl::desc("Alias for --format=darwin"),
- cl::Grouping, cl::cat(NMCat));
-
-static cl::list<std::string>
- ArchFlags("arch", cl::desc("architecture(s) from a Mach-O file to dump"),
- cl::ZeroOrMore, cl::cat(NMCat));
-bool ArchAll = false;
-
-cl::opt<bool> PrintFileName(
- "print-file-name",
- cl::desc("Precede each symbol with the object file it came from"),
- cl::cat(NMCat));
-
-cl::alias PrintFileNameA("A", cl::desc("Alias for --print-file-name"),
- cl::aliasopt(PrintFileName), cl::Grouping);
-cl::alias PrintFileNameo("o", cl::desc("Alias for --print-file-name"),
- cl::aliasopt(PrintFileName), cl::Grouping);
-
-cl::opt<bool> DebugSyms("debug-syms",
- cl::desc("Show all symbols, even debugger only"),
- cl::cat(NMCat));
-cl::alias DebugSymsa("a", cl::desc("Alias for --debug-syms"),
- cl::aliasopt(DebugSyms), cl::Grouping);
-
-cl::opt<bool> NumericSort("numeric-sort", cl::desc("Sort symbols by address"),
- cl::cat(NMCat));
-cl::alias NumericSortn("n", cl::desc("Alias for --numeric-sort"),
- cl::aliasopt(NumericSort), cl::Grouping);
-cl::alias NumericSortv("v", cl::desc("Alias for --numeric-sort"),
- cl::aliasopt(NumericSort), cl::Grouping);
-
-cl::opt<bool> NoSort("no-sort", cl::desc("Show symbols in order encountered"),
- cl::cat(NMCat));
-cl::alias NoSortp("p", cl::desc("Alias for --no-sort"), cl::aliasopt(NoSort),
- cl::Grouping);
-
-cl::opt<bool> Demangle("demangle", cl::ZeroOrMore,
- cl::desc("Demangle C++ symbol names"), cl::cat(NMCat));
-cl::alias DemangleC("C", cl::desc("Alias for --demangle"),
- cl::aliasopt(Demangle), cl::Grouping);
-cl::opt<bool> NoDemangle("no-demangle", cl::init(false), cl::ZeroOrMore,
- cl::desc("Don't demangle symbol names"),
- cl::cat(NMCat));
-
-cl::opt<bool> ReverseSort("reverse-sort", cl::desc("Sort in reverse order"),
- cl::cat(NMCat));
-cl::alias ReverseSortr("r", cl::desc("Alias for --reverse-sort"),
- cl::aliasopt(ReverseSort), cl::Grouping);
-
-cl::opt<bool> PrintSize("print-size",
- cl::desc("Show symbol size as well as address"),
- cl::cat(NMCat));
-cl::alias PrintSizeS("S", cl::desc("Alias for --print-size"),
- cl::aliasopt(PrintSize), cl::Grouping);
-bool MachOPrintSizeWarning = false;
-
-cl::opt<bool> SizeSort("size-sort", cl::desc("Sort symbols by size"),
- cl::cat(NMCat));
-
-cl::opt<bool> WithoutAliases("without-aliases", cl::Hidden,
- cl::desc("Exclude aliases from output"),
- cl::cat(NMCat));
-
-cl::opt<bool> ArchiveMap("print-armap", cl::desc("Print the archive map"),
- cl::cat(NMCat));
-cl::alias ArchiveMaps("M", cl::desc("Alias for --print-armap"),
- cl::aliasopt(ArchiveMap), cl::Grouping);
+using namespace llvm::opt; // for HelpHidden in Opts.inc
+enum ID {
+ OPT_INVALID = 0, // This is not an option ID.
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
+ HELPTEXT, METAVAR, VALUES) \
+ OPT_##ID,
+#include "Opts.inc"
+#undef OPTION
+};
+
+#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
+#include "Opts.inc"
+#undef PREFIX
+
+static const opt::OptTable::Info InfoTable[] = {
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
+ HELPTEXT, METAVAR, VALUES) \
+ { \
+ PREFIX, NAME, HELPTEXT, \
+ METAVAR, OPT_##ID, opt::Option::KIND##Class, \
+ PARAM, FLAGS, OPT_##GROUP, \
+ OPT_##ALIAS, ALIASARGS, VALUES},
+#include "Opts.inc"
+#undef OPTION
+};
+
+class NmOptTable : public opt::OptTable {
+public:
+ NmOptTable() : OptTable(InfoTable) { setGroupedShortOptions(true); }
+};
+
+enum OutputFormatTy { bsd, sysv, posix, darwin, just_symbols };
+} // namespace
+static bool ArchiveMap;
+static bool DebugSyms;
+static bool DefinedOnly;
+static bool Demangle;
+static bool DynamicSyms;
+static bool ExternalOnly;
+static OutputFormatTy OutputFormat;
+static bool NoLLVMBitcode;
+static bool NoSort;
+static bool NoWeakSymbols;
+static bool NumericSort;
+static bool PrintFileName;
+static bool PrintSize;
+static bool Quiet;
+static bool ReverseSort;
+static bool SpecialSyms;
+static bool SizeSort;
+static bool UndefinedOnly;
+static bool WithoutAliases;
+
+namespace {
enum Radix { d, o, x };
-cl::opt<Radix>
- AddressRadix("radix", cl::desc("Radix (o/d/x) for printing symbol Values"),
- cl::values(clEnumVal(d, "decimal"), clEnumVal(o, "octal"),
- clEnumVal(x, "hexadecimal")),
- cl::init(x), cl::cat(NMCat));
-cl::alias RadixAlias("t", cl::desc("Alias for --radix"),
- cl::aliasopt(AddressRadix));
-
-cl::opt<bool> JustSymbolName("just-symbol-name",
- cl::desc("Print just the symbol's name"),
- cl::cat(NMCat));
-cl::alias JustSymbolNames("j", cl::desc("Alias for --just-symbol-name"),
- cl::aliasopt(JustSymbolName), cl::Grouping);
-
-cl::opt<bool>
- SpecialSyms("special-syms",
- cl::desc("Do not filter special symbols from the output"),
- cl::cat(NMCat));
-
-cl::list<std::string> SegSect("s", cl::multi_val(2), cl::ZeroOrMore,
- cl::value_desc("segment section"), cl::Hidden,
- cl::desc("Dump only symbols from this segment "
- "and section name, Mach-O only"),
- cl::cat(NMCat));
-
-cl::opt<bool> FormatMachOasHex("x",
- cl::desc("Print symbol entry in hex, "
- "Mach-O only"),
- cl::Grouping, cl::cat(NMCat));
-cl::opt<bool> AddDyldInfo("add-dyldinfo",
- cl::desc("Add symbols from the dyldinfo not already "
- "in the symbol table, Mach-O only"),
- cl::cat(NMCat));
-cl::opt<bool> NoDyldInfo("no-dyldinfo",
- cl::desc("Don't add any symbols from the dyldinfo, "
- "Mach-O only"),
- cl::cat(NMCat));
-cl::opt<bool> DyldInfoOnly("dyldinfo-only",
- cl::desc("Show only symbols from the dyldinfo, "
- "Mach-O only"),
- cl::cat(NMCat));
-
-cl::opt<bool> NoLLVMBitcode("no-llvm-bc",
- cl::desc("Disable LLVM bitcode reader"),
- cl::cat(NMCat));
-
-cl::opt<bool> AddInlinedInfo("add-inlinedinfo",
- cl::desc("Add symbols from the inlined libraries, "
- "TBD(Mach-O) only"),
- cl::cat(NMCat));
-
-cl::extrahelp HelpResponse("\nPass @FILE as argument to read options from FILE.\n");
-
-bool PrintAddress = true;
-
-bool MultipleFiles = false;
-
-bool HadError = false;
-
-std::string ToolName;
-} // anonymous namespace
+} // namespace
+static Radix AddressRadix;
+
+// Mach-O specific options.
+static bool ArchAll = false;
+static std::vector<StringRef> ArchFlags;
+static bool AddDyldInfo;
+static bool AddInlinedInfo;
+static bool DyldInfoOnly;
+static bool FormatMachOasHex;
+static bool NoDyldInfo;
+static std::vector<StringRef> SegSect;
+static bool MachOPrintSizeWarning = false;
+
+// Miscellaneous states.
+static bool PrintAddress = true;
+static bool MultipleFiles = false;
+static bool HadError = false;
+
+static StringRef ToolName;
static void error(Twine Message, Twine Path = Twine()) {
HadError = true;
- WithColor::error(errs(), ToolName) << Path << ": " << Message << ".\n";
+ WithColor::error(errs(), ToolName) << Path << ": " << Message << "\n";
}
static bool error(std::error_code EC, Twine Path = Twine()) {
@@ -262,13 +159,13 @@ static void error(llvm::Error E, StringRef FileName, const Archive::Child &C,
errs() << "(" << NameOrErr.get() << ")";
if (!ArchitectureName.empty())
- errs() << " (for architecture " << ArchitectureName << ") ";
+ errs() << " (for architecture " << ArchitectureName << ")";
std::string Buf;
raw_string_ostream OS(Buf);
logAllUnhandledErrors(std::move(E), OS);
OS.flush();
- errs() << " " << Buf << "\n";
+ errs() << ": " << Buf << "\n";
}
// This version of error() prints the file name and which architecture slice it
@@ -281,13 +178,13 @@ static void error(llvm::Error E, StringRef FileName,
WithColor::error(errs(), ToolName) << FileName;
if (!ArchitectureName.empty())
- errs() << " (for architecture " << ArchitectureName << ") ";
+ errs() << " (for architecture " << ArchitectureName << ")";
std::string Buf;
raw_string_ostream OS(Buf);
logAllUnhandledErrors(std::move(E), OS);
OS.flush();
- errs() << " " << Buf << "\n";
+ errs() << ": " << Buf << "\n";
}
namespace {
@@ -737,16 +634,6 @@ static void writeFileName(raw_ostream &S, StringRef ArchiveName,
}
}
-static bool isSpecialSym(SymbolicFile &Obj, StringRef Name) {
- auto *ELFObj = dyn_cast<ELFObjectFileBase>(&Obj);
- if (!ELFObj)
- return false;
- uint16_t EMachine = ELFObj->getEMachine();
- if (EMachine != ELF::EM_ARM && EMachine != ELF::EM_AARCH64)
- return false;
- return !Name.empty() && Name[0] == '$';
-}
-
static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName,
StringRef ArchiveName,
StringRef ArchitectureName) {
@@ -769,10 +656,10 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName,
}
if (!PrintFileName) {
- if (OutputFormat == posix && MultipleFiles && printName) {
+ if ((OutputFormat == bsd || OutputFormat == posix ||
+ OutputFormat == just_symbols) &&
+ MultipleFiles && printName) {
outs() << '\n' << CurrentFilename << ":\n";
- } else if (OutputFormat == bsd && MultipleFiles && printName) {
- outs() << "\n" << CurrentFilename << ":\n";
} else if (OutputFormat == sysv) {
outs() << "\n\nSymbols from " << CurrentFilename << ":\n\n";
if (isSymbolList64Bit(Obj))
@@ -835,13 +722,14 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName,
bool Undefined = SymFlags & SymbolRef::SF_Undefined;
bool Global = SymFlags & SymbolRef::SF_Global;
bool Weak = SymFlags & SymbolRef::SF_Weak;
+ bool FormatSpecific = SymFlags & SymbolRef::SF_FormatSpecific;
if ((!Undefined && UndefinedOnly) || (Undefined && DefinedOnly) ||
(!Global && ExternalOnly) || (Weak && NoWeakSymbols) ||
- (!SpecialSyms && isSpecialSym(Obj, Name)))
+ (FormatSpecific && !(SpecialSyms || DebugSyms)))
continue;
if (PrintFileName)
writeFileName(outs(), ArchiveName, ArchitectureName);
- if ((JustSymbolName ||
+ if ((OutputFormat == just_symbols ||
(UndefinedOnly && MachO && OutputFormat != darwin)) &&
OutputFormat != posix) {
outs() << Name << "\n";
@@ -1142,13 +1030,16 @@ static char getNMSectionTagAndName(SymbolicFile &Obj, basic_symbol_iterator I,
}
}
- if ((Symflags & object::SymbolRef::SF_Weak) && !isa<MachOObjectFile>(Obj)) {
- char Ret = isObject(Obj, I) ? 'v' : 'w';
- return (!(Symflags & object::SymbolRef::SF_Undefined)) ? toupper(Ret) : Ret;
+ if (Symflags & object::SymbolRef::SF_Undefined) {
+ if (isa<MachOObjectFile>(Obj) || !(Symflags & object::SymbolRef::SF_Weak))
+ return 'U';
+ return isObject(Obj, I) ? 'v' : 'w';
}
-
- if (Symflags & object::SymbolRef::SF_Undefined)
- return 'U';
+ if (isa<ELFObjectFileBase>(&Obj))
+ if (ELFSymbolRef(*I).getELFType() == ELF::STT_GNU_IFUNC)
+ return 'i';
+ if (!isa<MachOObjectFile>(Obj) && (Symflags & object::SymbolRef::SF_Weak))
+ return isObject(Obj, I) ? 'V' : 'W';
if (Symflags & object::SymbolRef::SF_Common)
return 'C';
@@ -1169,8 +1060,6 @@ static char getNMSectionTagAndName(SymbolicFile &Obj, basic_symbol_iterator I,
else if (TapiFile *Tapi = dyn_cast<TapiFile>(&Obj))
Ret = getSymbolNMTypeChar(*Tapi, I);
else if (ELFObjectFileBase *ELF = dyn_cast<ELFObjectFileBase>(&Obj)) {
- if (ELFSymbolRef(*I).getELFType() == ELF::STT_GNU_IFUNC)
- return 'i';
Ret = getSymbolNMTypeChar(*ELF, I);
if (ELFSymbolRef(*I).getBinding() == ELF::STB_GNU_UNIQUE)
return Ret;
@@ -1806,7 +1695,14 @@ static void dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName,
error(SymFlagsOrErr.takeError(), Obj.getFileName());
return;
}
- if (!DebugSyms && (*SymFlagsOrErr & SymbolRef::SF_FormatSpecific))
+
+ // Don't drop format specifc symbols for ARM and AArch64 ELF targets, they
+ // are used to repesent mapping symbols and needed to honor the
+ // --special-syms option.
+ auto *ELFObj = dyn_cast<ELFObjectFileBase>(&Obj);
+ if ((!ELFObj || (ELFObj->getEMachine() != ELF::EM_ARM &&
+ ELFObj->getEMachine() != ELF::EM_AARCH64)) &&
+ !DebugSyms && (*SymFlagsOrErr & SymbolRef::SF_FormatSpecific))
continue;
if (WithoutAliases && (*SymFlagsOrErr & SymbolRef::SF_Indirect))
continue;
@@ -1860,7 +1756,7 @@ static void dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName,
CurrentFilename = Obj.getFileName();
- if (Symbols.empty() && SymbolList.empty()) {
+ if (Symbols.empty() && SymbolList.empty() && !Quiet) {
writeFileName(errs(), ArchiveName, ArchitectureName);
errs() << "no symbols\n";
}
@@ -2228,8 +2124,80 @@ static void dumpSymbolNamesFromFile(std::string &Filename) {
int main(int argc, char **argv) {
InitLLVM X(argc, argv);
- cl::HideUnrelatedOptions(NMCat);
- cl::ParseCommandLineOptions(argc, argv, "llvm symbol table dumper\n");
+ BumpPtrAllocator A;
+ StringSaver Saver(A);
+ NmOptTable Tbl;
+ ToolName = argv[0];
+ opt::InputArgList Args =
+ Tbl.parseArgs(argc, argv, OPT_UNKNOWN, Saver, [&](StringRef Msg) {
+ error(Msg);
+ exit(1);
+ });
+ if (Args.hasArg(OPT_help)) {
+ Tbl.printHelp(
+ outs(),
+ (Twine(ToolName) + " [options] <input object files>").str().c_str(),
+ "LLVM symbol table dumper");
+ // TODO Replace this with OptTable API once it adds extrahelp support.
+ outs() << "\nPass @FILE as argument to read options from FILE.\n";
+ return 0;
+ }
+ if (Args.hasArg(OPT_version)) {
+ // This needs to contain the word "GNU", libtool looks for that string.
+ outs() << "llvm-nm, compatible with GNU nm" << '\n';
+ cl::PrintVersionMessage();
+ return 0;
+ }
+
+ DebugSyms = Args.hasArg(OPT_debug_syms);
+ DefinedOnly = Args.hasArg(OPT_defined_only);
+ Demangle = Args.hasFlag(OPT_demangle, OPT_no_demangle, false);
+ DynamicSyms = Args.hasArg(OPT_dynamic);
+ ExternalOnly = Args.hasArg(OPT_extern_only);
+ StringRef V = Args.getLastArgValue(OPT_format_EQ, "bsd");
+ if (V == "bsd")
+ OutputFormat = bsd;
+ else if (V == "posix")
+ OutputFormat = posix;
+ else if (V == "sysv")
+ OutputFormat = sysv;
+ else if (V == "darwin")
+ OutputFormat = darwin;
+ else if (V == "just-symbols")
+ OutputFormat = just_symbols;
+ else
+ error("--format value should be one of: bsd, posix, sysv, darwin, "
+ "just-symbols");
+ NoLLVMBitcode = Args.hasArg(OPT_no_llvm_bc);
+ NoSort = Args.hasArg(OPT_no_sort);
+ NoWeakSymbols = Args.hasArg(OPT_no_weak);
+ NumericSort = Args.hasArg(OPT_numeric_sort);
+ ArchiveMap = Args.hasArg(OPT_print_armap);
+ PrintFileName = Args.hasArg(OPT_print_file_name);
+ PrintSize = Args.hasArg(OPT_print_size);
+ ReverseSort = Args.hasArg(OPT_reverse_sort);
+ Quiet = Args.hasArg(OPT_quiet);
+ V = Args.getLastArgValue(OPT_radix_EQ, "x");
+ if (V == "o")
+ AddressRadix = Radix::o;
+ else if (V == "d")
+ AddressRadix = Radix::d;
+ else if (V == "x")
+ AddressRadix = Radix::x;
+ else
+ error("--radix value should be one of: 'o' (octal), 'd' (decimal), 'x' "
+ "(hexadecimal)");
+ SizeSort = Args.hasArg(OPT_size_sort);
+ SpecialSyms = Args.hasArg(OPT_special_syms);
+ UndefinedOnly = Args.hasArg(OPT_undefined_only);
+ WithoutAliases = Args.hasArg(OPT_without_aliases);
+
+ // Mach-O specific options.
+ FormatMachOasHex = Args.hasArg(OPT_x);
+ AddDyldInfo = Args.hasArg(OPT_add_dyldinfo);
+ AddInlinedInfo = Args.hasArg(OPT_add_inlinedinfo);
+ DyldInfoOnly = Args.hasArg(OPT_dyldinfo_only);
+ NoDyldInfo = Args.hasArg(OPT_no_dyldinfo);
// llvm-nm only reads binary files.
if (error(sys::ChangeStdinToBinary()))
@@ -2240,14 +2208,6 @@ int main(int argc, char **argv) {
llvm::InitializeAllTargetMCs();
llvm::InitializeAllAsmParsers();
- ToolName = argv[0];
- if (BSDFormat)
- OutputFormat = bsd;
- if (POSIXFormat)
- OutputFormat = posix;
- if (DarwinFormat)
- OutputFormat = darwin;
-
// The relative order of these is important. If you pass --size-sort it should
// only print out the size. However, if you pass -S --size-sort, it should
// print out both the size and address.
@@ -2255,29 +2215,44 @@ int main(int argc, char **argv) {
PrintAddress = false;
if (OutputFormat == sysv || SizeSort)
PrintSize = true;
- if (InputFilenames.empty())
- InputFilenames.push_back("a.out");
- if (InputFilenames.size() > 1)
- MultipleFiles = true;
-
- // If both --demangle and --no-demangle are specified then pick the last one.
- if (NoDemangle.getPosition() > Demangle.getPosition())
- Demangle = !NoDemangle;
- for (unsigned i = 0; i < ArchFlags.size(); ++i) {
- if (ArchFlags[i] == "all") {
- ArchAll = true;
- } else {
- if (!MachOObjectFile::isValidArch(ArchFlags[i]))
- error("Unknown architecture named '" + ArchFlags[i] + "'",
+ for (const auto *A : Args.filtered(OPT_arch_EQ)) {
+ SmallVector<StringRef, 2> Values;
+ llvm::SplitString(A->getValue(), Values, ",");
+ for (StringRef V : Values) {
+ if (V == "all")
+ ArchAll = true;
+ else if (MachOObjectFile::isValidArch(V))
+ ArchFlags.push_back(V);
+ else
+ error("Unknown architecture named '" + V + "'",
"for the --arch option");
}
}
+ // Mach-O takes -s to accept two arguments. We emulate this by iterating over
+ // both OPT_s and OPT_INPUT.
+ std::vector<std::string> InputFilenames;
+ int SegSectArgs = 0;
+ for (opt::Arg *A : Args.filtered(OPT_s, OPT_INPUT)) {
+ if (SegSectArgs > 0) {
+ --SegSectArgs;
+ SegSect.push_back(A->getValue());
+ } else if (A->getOption().matches(OPT_s)) {
+ SegSectArgs = 2;
+ } else {
+ InputFilenames.push_back(A->getValue());
+ }
+ }
if (!SegSect.empty() && SegSect.size() != 2)
error("bad number of arguments (must be two arguments)",
"for the -s option");
+ if (InputFilenames.empty())
+ InputFilenames.push_back("a.out");
+ if (InputFilenames.size() > 1)
+ MultipleFiles = true;
+
if (NoDyldInfo && (AddDyldInfo || DyldInfoOnly))
error("--no-dyldinfo can't be used with --add-dyldinfo or --dyldinfo-only");