Add option for specifying the path to assembler, "as". This overrides the path

[oota-llvm.git] / tools / gold / gold-plugin.cpp

diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp
index 260e175282d53a6bf784c3033222342ae27c8c3b..46b1717fca690e62c170e0d1026a8c2d55aa544d 100644 (file)
--- a/tools/gold/gold-plugin.cpp
+++ b/tools/gold/gold-plugin.cpp
@@ -44,6 +44,8 @@ namespace {
   int gold_version = 0;
 
   bool generate_api_file = false;
+  const char *gcc_path = NULL;
+  const char *as_path = NULL;
 
   struct claimed_file {
     lto_module_t M;
@@ -101,6 +103,20 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
       case LDPT_OPTION:
         if (strcmp("generate-api-file", tv->tv_u.tv_string) == 0) {
           generate_api_file = true;
+        } else if (strncmp("gcc=", tv->tv_u.tv_string, 4) == 0) {
+          if (gcc_path) {
+            (*message)(LDPL_WARNING, "Path to gcc specified twice. "
+                       "Discarding %s", tv->tv_u.tv_string);
+          } else {
+            gcc_path = strdup(tv->tv_u.tv_string + 4);
+          }
+        } else if (strncmp("as=", tv->tv_u.tv_string, 3) == 0) {
+          if (as_path) {
+            (*message)(LDPL_WARNING, "Path to as specified twice. "
+                       "Discarding %s", tv->tv_u.tv_string);
+          } else {
+            as_path = strdup(tv->tv_u.tv_string + 3);
+          }
         } else {
           (*message)(LDPL_WARNING, "Ignoring flag %s", tv->tv_u.tv_string);
         }
@@ -336,6 +352,10 @@ ld_plugin_status all_symbols_read_hook(void) {
 
   lto_codegen_set_pic_model(cg, output_type);
   lto_codegen_set_debug_model(cg, LTO_DEBUG_MODEL_DWARF);
+  if (gcc_path)
+    lto_codegen_set_gcc_path(cg, gcc_path);
+  if (as_path)
+    lto_codegen_set_assembler_path(cg, as_path);
 
   size_t bufsize = 0;
   const char *buffer = static_cast<const char *>(lto_codegen_compile(cg,