[llvm-commits] [llvm-gcc-4.2] r73146 - /llvm-gcc-4.2/trunk/gcc/gcc.c

[Rafael Espindola]

Author: rafael
Date: Tue Jun  9 16:22:03 2009
New Revision: 73146

URL: http://llvm.org/viewvc/llvm-project?rev=73146&view=rev
Log:
Pass as instead of gcc to the gold plugin.


Modified:
    llvm-gcc-4.2/trunk/gcc/gcc.c

Modified: llvm-gcc-4.2/trunk/gcc/gcc.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gcc.c?rev=73146&r1=73145&r2=73146&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gcc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/gcc.c Tue Jun  9 16:22:03 2009
@@ -720,7 +720,7 @@
     %(linker) \
     %{use-gold-plugin: \
      -plugin %(gold_plugin_file) \
-     -plugin-opt=gcc=%(gold_plugin_gcc) \
+     -plugin-opt=as=%(gold_plugin_as) \
     } \
     %l " LINK_PIE_SPEC "%X %{o*} %{A} %{d} %<emit-llvm %{e*}\
     %{m} %{N} %{n} %{r}\
@@ -777,7 +777,7 @@
 /* LLVM LOCAL begin */
 #ifdef ENABLE_LLVM
 static const char *gold_plugin_file_spec = "";
-static const char *gold_plugin_gcc_spec = "";
+static const char *gold_plugin_as_spec = "";
 #endif
 /* LLVM LOCAL end */
 static const char *link_command_spec = LINK_COMMAND_SPEC;
@@ -1661,7 +1661,7 @@
   /* LLVM LOCAL begin */
 #ifdef ENABLE_LLVM
   INIT_STATIC_SPEC ("gold_plugin_file",		&gold_plugin_file_spec),
-  INIT_STATIC_SPEC ("gold_plugin_gcc",		&gold_plugin_gcc_spec),
+  INIT_STATIC_SPEC ("gold_plugin_as",		&gold_plugin_as_spec),
   INIT_STATIC_SPEC ("llvm_options",		&llvm_options),
 #endif
   /* LLVM LOCAL end */
@@ -7189,7 +7189,7 @@
 	  if (!gold_plugin_file_spec)
 	    fatal ("-use-gold-plugin, but libLLVMgold.so not found.");
 	}
-      gold_plugin_gcc_spec = argv[0];
+      gold_plugin_as_spec = find_a_file (&exec_prefixes, "as", X_OK, false);
 #endif
       /* LLVM LOCAL end */
       /* Rebuild the COMPILER_PATH and LIBRARY_PATH environment variables