[llvm] 99f8751 - Revert "[llvm-{debuginfod,ml,objdump,symbolizer}, dsymutil] Enable multicall driver"
Petr Hosek via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 17 00:59:54 PDT 2023
Author: Petr Hosek
Date: 2023-08-17T07:59:29Z
New Revision: 99f8751c1509e66ca8401886c756751ac94bc222
URL: https://github.com/llvm/llvm-project/commit/99f8751c1509e66ca8401886c756751ac94bc222
DIFF: https://github.com/llvm/llvm-project/commit/99f8751c1509e66ca8401886c756751ac94bc222.diff
LOG: Revert "[llvm-{debuginfod,ml,objdump,symbolizer}, dsymutil] Enable multicall driver"
This reverts commit 2628fa3351b021d2ab82dcd833a14d7b52840a01 since
it broke the multicall driver build.
Added:
Modified:
llvm/tools/dsymutil/CMakeLists.txt
llvm/tools/dsymutil/dsymutil.cpp
llvm/tools/llvm-debuginfod/CMakeLists.txt
llvm/tools/llvm-debuginfod/llvm-debuginfod.cpp
llvm/tools/llvm-driver/CMakeLists.txt
llvm/tools/llvm-ml/CMakeLists.txt
llvm/tools/llvm-ml/llvm-ml.cpp
llvm/tools/llvm-objdump/CMakeLists.txt
llvm/tools/llvm-objdump/llvm-objdump.cpp
llvm/tools/llvm-symbolizer/CMakeLists.txt
llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
Removed:
################################################################################
diff --git a/llvm/tools/dsymutil/CMakeLists.txt b/llvm/tools/dsymutil/CMakeLists.txt
index 3cb7594d2fd920..27669a86c9bd50 100644
--- a/llvm/tools/dsymutil/CMakeLists.txt
+++ b/llvm/tools/dsymutil/CMakeLists.txt
@@ -36,10 +36,9 @@ add_llvm_tool(dsymutil
intrinsics_gen
${tablegen_deps}
DsymutilTableGen
- GENERATE_DRIVER
)
-if(APPLE AND NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
+if(APPLE)
target_link_libraries(dsymutil PRIVATE "-framework CoreFoundation")
endif(APPLE AND NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
diff --git a/llvm/tools/dsymutil/dsymutil.cpp b/llvm/tools/dsymutil/dsymutil.cpp
index 9f62546b2467e3..20d11bceb05eed 100644
--- a/llvm/tools/dsymutil/dsymutil.cpp
+++ b/llvm/tools/dsymutil/dsymutil.cpp
@@ -595,7 +595,7 @@ getOutputFileName(StringRef InputFile, const DsymutilOptions &Options) {
return OutputLocation(std::string(Path.str()), ResourceDir);
}
-int dsymutil_main(int argc, char **argv, const llvm::ToolContext &) {
+int main(int argc, char **argv) {
InitLLVM X(argc, argv);
// Parse arguments.
diff --git a/llvm/tools/llvm-debuginfod/CMakeLists.txt b/llvm/tools/llvm-debuginfod/CMakeLists.txt
index 6b0a1193d1b222..d32c6826d7687e 100644
--- a/llvm/tools/llvm-debuginfod/CMakeLists.txt
+++ b/llvm/tools/llvm-debuginfod/CMakeLists.txt
@@ -11,13 +11,8 @@ add_llvm_tool(llvm-debuginfod
DEPENDS
DebugInfodOptsTableGen
- GENERATE_DRIVER
)
-
-if(NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
- target_link_libraries(llvm-debuginfod PRIVATE LLVMDebuginfod)
-endif()
-
+target_link_libraries(llvm-debuginfod PRIVATE LLVMDebuginfod)
if(LLVM_INSTALL_BINUTILS_SYMLINKS)
add_llvm_tool_symlink(debuginfod llvm-debuginfod)
endif()
diff --git a/llvm/tools/llvm-debuginfod/llvm-debuginfod.cpp b/llvm/tools/llvm-debuginfod/llvm-debuginfod.cpp
index b9e2c6747187e2..1869f2eb4bc6d4 100644
--- a/llvm/tools/llvm-debuginfod/llvm-debuginfod.cpp
+++ b/llvm/tools/llvm-debuginfod/llvm-debuginfod.cpp
@@ -23,7 +23,6 @@
#include "llvm/Option/Option.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/LLVMDriver.h"
#include "llvm/Support/ThreadPool.h"
using namespace llvm;
@@ -120,7 +119,7 @@ static void parseArgs(int argc, char **argv) {
HostInterface = Args.getLastArgValue(OPT_host_interface, "0.0.0.0");
}
-int llvm_debuginfod_main(int argc, char **argv, const llvm::ToolContext &) {
+int main(int argc, char **argv) {
InitLLVM X(argc, argv);
HTTPClient::initialize();
parseArgs(argc, argv);
diff --git a/llvm/tools/llvm-driver/CMakeLists.txt b/llvm/tools/llvm-driver/CMakeLists.txt
index 1c473c99cc1bf1..23cc37354eaa35 100644
--- a/llvm/tools/llvm-driver/CMakeLists.txt
+++ b/llvm/tools/llvm-driver/CMakeLists.txt
@@ -25,12 +25,6 @@ target_sources(llvm-driver PRIVATE llvm-driver.cpp)
set_target_properties(llvm-driver PROPERTIES OUTPUT_NAME llvm)
target_link_libraries(llvm-driver PUBLIC ${LLVM_DRIVER_OBJLIBS})
-target_link_libraries(llvm-driver PUBLIC LLVMDebuginfod)
-
-if(LLVM_HAVE_LIBXAR)
- # used by llvm-objdump
- target_link_libraries(llvm-driver PUBLIC ${XAR_LIB})
-endif()
if(APPLE)
# dsymutil uses some CoreFoundation stuff on Darwin...
diff --git a/llvm/tools/llvm-ml/CMakeLists.txt b/llvm/tools/llvm-ml/CMakeLists.txt
index fe01d24b83407e..2b2a116a5fec36 100644
--- a/llvm/tools/llvm-ml/CMakeLists.txt
+++ b/llvm/tools/llvm-ml/CMakeLists.txt
@@ -18,5 +18,4 @@ add_public_tablegen_target(MLTableGen)
add_llvm_tool(llvm-ml
llvm-ml.cpp
Disassembler.cpp
- GENERATE_DRIVER
)
diff --git a/llvm/tools/llvm-ml/llvm-ml.cpp b/llvm/tools/llvm-ml/llvm-ml.cpp
index 4d6bd90d13ad52..f8e4734be63658 100644
--- a/llvm/tools/llvm-ml/llvm-ml.cpp
+++ b/llvm/tools/llvm-ml/llvm-ml.cpp
@@ -35,7 +35,6 @@
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/LLVMDriver.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Process.h"
@@ -186,7 +185,7 @@ static int AssembleInput(StringRef ProgName, const Target *TheTarget,
return Res;
}
-int llvm_ml_main(int Argc, char **Argv, const llvm::ToolContext &) {
+int main(int Argc, char **Argv) {
InitLLVM X(Argc, Argv);
StringRef ProgName = sys::path::filename(Argv[0]);
diff --git a/llvm/tools/llvm-objdump/CMakeLists.txt b/llvm/tools/llvm-objdump/CMakeLists.txt
index 73c857085e65bf..65d2f92848dbcc 100644
--- a/llvm/tools/llvm-objdump/CMakeLists.txt
+++ b/llvm/tools/llvm-objdump/CMakeLists.txt
@@ -34,14 +34,11 @@ add_llvm_tool(llvm-objdump
DEPENDS
ObjdumpOptsTableGen
OtoolOptsTableGen
- GENERATE_DRIVER
)
-if(NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
- target_link_libraries(llvm-objdump PRIVATE LLVMDebuginfod)
-endif()
+target_link_libraries(llvm-objdump PRIVATE LLVMDebuginfod)
-if(LLVM_HAVE_LIBXAR AND NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
+if(LLVM_HAVE_LIBXAR)
target_link_libraries(llvm-objdump PRIVATE ${XAR_LIB})
endif()
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 1e5175b527710b..47a8941a009554 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -73,7 +73,6 @@
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/GraphWriter.h"
#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/LLVMDriver.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/StringSaver.h"
@@ -3248,7 +3247,7 @@ static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
InputFilenames.push_back("a.out");
}
-int llvm_objdump_main(int argc, char **argv, const llvm::ToolContext &) {
+int main(int argc, char **argv) {
using namespace llvm;
InitLLVM X(argc, argv);
diff --git a/llvm/tools/llvm-symbolizer/CMakeLists.txt b/llvm/tools/llvm-symbolizer/CMakeLists.txt
index 6f8de1f1f49437..a6bc047154c675 100644
--- a/llvm/tools/llvm-symbolizer/CMakeLists.txt
+++ b/llvm/tools/llvm-symbolizer/CMakeLists.txt
@@ -20,12 +20,9 @@ add_llvm_tool(llvm-symbolizer
DEPENDS
SymbolizerOptsTableGen
- GENERATE_DRIVER
)
-if(NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
- target_link_libraries(llvm-symbolizer PRIVATE LLVMDebuginfod)
-endif()
+target_link_libraries(llvm-symbolizer PRIVATE LLVMDebuginfod)
add_llvm_tool_symlink(llvm-addr2line llvm-symbolizer)
diff --git a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
index 4c1c2f224984c7..f43aad6c4cf7c8 100644
--- a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
+++ b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
@@ -34,7 +34,6 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/LLVMDriver.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/StringSaver.h"
#include "llvm/Support/WithColor.h"
@@ -396,7 +395,7 @@ static void filterMarkup(const opt::InputArgList &Args, LLVMSymbolizer &Symboliz
Filter.finish();
}
-int llvm_symbolizer_main(int argc, char **argv, const llvm::ToolContext &) {
+int main(int argc, char **argv) {
InitLLVM X(argc, argv);
sys::InitializeCOMRAII COM(sys::COMThreadingMode::MultiThreaded);
More information about the llvm-commits
mailing list