Skip to content

Commit 6103fdf

Browse files
committedJul 19, 2021
[ifs][elfabi] Merge llvm-ifs/elfabi tools
This change merges llvm-elfabi and llvm-ifs tools. Differential Revision: https://reviews.llvm.org/D100139
1 parent 61fa9af commit 6103fdf

File tree

69 files changed

+380
-758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+380
-758
lines changed
 

‎clang/cmake/caches/Fuchsia-stage2.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ set(LLVM_TOOLCHAIN_TOOLS
246246
llvm-dlltool
247247
llvm-dwarfdump
248248
llvm-dwp
249-
llvm-elfabi
249+
llvm-ifs
250250
llvm-gsymutil
251251
llvm-lib
252252
llvm-lipo

‎clang/lib/Driver/ToolChains/InterfaceStubs.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ void Merger::ConstructJob(Compilation &C, const JobAction &JA,
2020
const llvm::opt::ArgList &Args,
2121
const char *LinkingOutput) const {
2222
std::string Merger = getToolChain().GetProgramPath(getShortName());
23+
// TODO: Use IFS library directly in the future.
2324
llvm::opt::ArgStringList CmdArgs;
24-
CmdArgs.push_back("-action");
25+
CmdArgs.push_back("--input-format=IFS");
2526
const bool WriteBin = !Args.getLastArg(options::OPT_emit_merged_ifs);
26-
CmdArgs.push_back(WriteBin ? "write-bin" : "write-ifs");
27+
CmdArgs.push_back(WriteBin ? "--output-format=ELF" : "--output-format=IFS");
2728
CmdArgs.push_back("-o");
2829

2930
// Normally we want to write to a side-car file ending in ".ifso" so for

0 commit comments

Comments
 (0)