Mercurial > hg > aboriginal

view sources/patches/gcc-core-stopdefaults2.patch @ 1780:af5da3b293cb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert a broken commit that breaks mips on 4.0.
author Rob Landley <rob@landley.net>
date Thu, 23 Jul 2015 09:06:13 -0500
parents ba28c96cba42
children
line wrap: on
line source

Fix from Bobby Bingham.

diff -ru gcc-core/gcc/gcc.c gcc-core2/gcc/gcc.c
--- gcc-core/gcc/gcc.c	2014-01-05 20:23:51.963533293 -0600
+++ gcc-core2/gcc/gcc.c	2014-01-05 20:28:03.776864811 -0600
@@ -1473,8 +1473,6 @@
 #endif
 
 static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
-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;
@@ -3949,16 +3947,10 @@
 	      PREFIX_PRIORITY_LAST, 2, 0);
   add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
 	      PREFIX_PRIORITY_LAST, 2, 0);
-  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, "BINUTILS",
 	      PREFIX_PRIORITY_LAST, 1, 0);
-  add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
-	      PREFIX_PRIORITY_LAST, 1, 0);
 
   tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
 			   dir_separator_str, NULL);