diff --git a/llvm/tools/bugpoint/ExecutionDriver.cpp b/llvm/tools/bugpoint/ExecutionDriver.cpp
index f4a072b14aede9f0649b7c3e7ca348bc9f6dbe4e..9a670c950c0c15eb6f540c1e500076e98d89e2a6 100644
--- a/llvm/tools/bugpoint/ExecutionDriver.cpp
+++ b/llvm/tools/bugpoint/ExecutionDriver.cpp
@@ -260,7 +260,7 @@ std::string BugDriver::executeProgram(std::string OutputFile,
   // as the GCCArgs.
   int RetVal = 0;
   if (InterpreterSel == RunLLC || InterpreterSel == RunCBE ||
-      InterpreterSel == CBE_bug)
+      InterpreterSel == CBE_bug || InterpreterSel == LLC_Safe)
     RetVal = AI->ExecuteProgram(BytecodeFile, InputArgv, InputFile,
                                 OutputFile, AdditionalLinkerArgs, SharedObjs, 
                                 Timeout, MemoryLimit);
diff --git a/llvm/tools/bugpoint/ToolRunner.cpp b/llvm/tools/bugpoint/ToolRunner.cpp
index cc726676a31fdd1b4e00993fe2f8ac3e28cbca06..163c36acb058fcc4cb624a654f24ef04714675f6 100644
--- a/llvm/tools/bugpoint/ToolRunner.cpp
+++ b/llvm/tools/bugpoint/ToolRunner.cpp
@@ -555,6 +555,8 @@ int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType,
   GCCArgs.push_back(fileType == AsmFile ? "assembler" : "c");
   GCCArgs.push_back("-fno-strict-aliasing");
   GCCArgs.push_back(InputFile.c_str());   // Specify the input filename.
+  GCCArgs.push_back("-x");
+  GCCArgs.push_back("none");
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
   GCCArgs.push_back("-G");       // Compile a shared library, `-G' for Sparc
 #elif defined(__APPLE__)