From 0e95b3aba9b2039ae3af617e681aacca2ff81f79 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 2 Oct 2013 14:36:23 +0000
Subject: Fix option parsing in the gold plugin.

This was broken when options were moved up in r191680. No test because this is
specific LLVMgold.so/libLTO.so.

Patch by Tom Roeder!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191829 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/lto/lto.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'tools/lto/lto.cpp')

diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp
index 79967207f5..7bfddcd9ec 100644
--- a/tools/lto/lto.cpp
+++ b/tools/lto/lto.cpp
@@ -40,6 +40,9 @@ static std::string sLastErrorString;
 // *** Not thread safe ***
 static bool initialized = false;
 
+// Holds the command-line option parsing state of the LTO module.
+static bool parsedOptions = false;
+
 // Initialize the configured targets if they have not been initialized.
 static void lto_initialize() {
   if (!initialized) {
@@ -261,6 +264,10 @@ void lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg,
 /// that contains the merged contents of all modules added so far. Returns true
 /// on error (check lto_get_error_message() for details).
 bool lto_codegen_write_merged_modules(lto_code_gen_t cg, const char *path) {
+  if (!parsedOptions) {
+    cg->parseCodeGenDebugOptions();
+    parsedOptions = true;
+  }
   return !cg->writeMergedModules(path, sLastErrorString);
 }
 
@@ -271,6 +278,10 @@ bool lto_codegen_write_merged_modules(lto_code_gen_t cg, const char *path) {
 /// lto_codegen_compile() is called again. On failure, returns NULL (check
 /// lto_get_error_message() for details).
 const void *lto_codegen_compile(lto_code_gen_t cg, size_t *length) {
+  if (!parsedOptions) {
+    cg->parseCodeGenDebugOptions();
+    parsedOptions = true;
+  }
   return cg->compile(length, DisableOpt, DisableInline, DisableGVNLoadPRE,
                      sLastErrorString);
 }
@@ -279,6 +290,10 @@ const void *lto_codegen_compile(lto_code_gen_t cg, size_t *length) {
 /// native object file. The name of the file is written to name. Returns true on
 /// error.
 bool lto_codegen_compile_to_file(lto_code_gen_t cg, const char **name) {
+  if (!parsedOptions) {
+    cg->parseCodeGenDebugOptions();
+    parsedOptions = true;
+  }
   return !cg->compile_to_file(name, DisableOpt, DisableInline, DisableGVNLoadPRE,
                               sLastErrorString);
 }
-- 
cgit v1.2.3