From d6f455ebca79b6a3d374158a047b1cdd744ebc5e Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Fri, 5 Apr 2013 17:17:49 -0700 Subject: [PATCH] rustllvm: Only initialize command-line arguments once In my WIP on rustpkg, I was calling driver code that calls LLVMRustWriteOutputFile more than once. This was making LLVM unhappy, since that function has code that initializes the command-line options for LLVM, and I guess you can't do that more than once. So, check if they've already been initialized. --- src/rustllvm/RustWrapper.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index c4846c1a62b..bdf13746f3e 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -62,6 +62,8 @@ using namespace llvm::sys; static const char *LLVMRustError; +extern cl::opt EnableARMEHABI; + extern "C" LLVMMemoryBufferRef LLVMRustCreateMemoryBufferWithContentsOfFile(const char *Path) { LLVMMemoryBufferRef MemBuf = NULL; @@ -429,10 +431,16 @@ LLVMRustWriteOutputFile(LLVMPassManagerRef PMR, LLVMRustInitializeTargets(); - int argc = 3; - const char* argv[] = {"rustc", "-arm-enable-ehabi", - "-arm-enable-ehabi-descriptors"}; - cl::ParseCommandLineOptions(argc, argv); + // Initializing the command-line options more than once is not + // allowed. So, check if they've already been initialized. + // (This could happen if we're being called from rustpkg, for + // example.) + if (!EnableARMEHABI) { + int argc = 3; + const char* argv[] = {"rustc", "-arm-enable-ehabi", + "-arm-enable-ehabi-descriptors"}; + cl::ParseCommandLineOptions(argc, argv); + } TargetOptions Options; Options.NoFramePointerElim = true;