2009-08-24 Rafael Avila de Espindola <espindola@google.com>

	* gcc.c (standard_exec_prefix_1,standard_exec_prefix_2): Remove.
	(process_command): Don't search standard_exec_prefix_1 and
	standard_exec_prefix_2.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151054 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a69996d..0266cc4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-24  Rafael Avila de Espindola  <espindola@google.com>
+
+       * gcc.c (standard_exec_prefix_1,standard_exec_prefix_2): Remove.
+       (process_command): Don't search standard_exec_prefix_1 and
+       standard_exec_prefix_2.
+
 2009-08-24  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
        * config/arm/arm.c (output_return_instruction): Handle for

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5c028f9..5f857fa 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1572,8 +1572,6 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
 /* For native compilers, these are well-known paths containing
    components that may be provided by the system.  For cross
    compilers, these paths are not used.  */
-static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
-static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
 static const char *md_exec_prefix = MD_EXEC_PREFIX;
 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
@@ -4292,19 +4290,6 @@ process_command (int argc, const char **argv)
                  PREFIX_PRIORITY_LAST, 1, 0);
     }
 
-  /* If not cross-compiling, search well-known system locations.  */
-  if (*cross_compile == '0')
-    {
-#ifndef OS2
-      add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
-                 PREFIX_PRIORITY_LAST, 2, 0);
-      add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
-                 PREFIX_PRIORITY_LAST, 2, 0);
-#endif
-      add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
-                 PREFIX_PRIORITY_LAST, 1, 0);
-    }
-
   gcc_assert (!IS_ABSOLUTE_PATH (tooldir_base_prefix));
   tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
                           dir_separator_str, NULL);