Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: gcc/gcc/tlink.c

Issue 3050029: [gcc] GCC 4.5.0=>4.5.1 (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/nacl-toolchain.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gcc/gcc/timevar.def ('k') | gcc/gcc/toplev.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gcc/gcc/tlink.c
diff --git a/gcc/gcc/tlink.c b/gcc/gcc/tlink.c
index 50206472eba23e98010413b43c17033d05f92a72..7b589832b06ce799fde99fec725666e764e36e22 100644
--- a/gcc/gcc/tlink.c
+++ b/gcc/gcc/tlink.c
@@ -32,6 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "collect2.h"
#include "libiberty.h"
+/* TARGET_64BIT may be defined to use driver specific functionality. */
+#undef TARGET_64BIT
+#define TARGET_64BIT TARGET_64BIT_DEFAULT
+
#define MAX_ITERATIONS 17
/* Defined in the automatically-generated underscore.c. */
@@ -283,7 +287,7 @@ tlink_execute (const char *prog, char **argv, const char *outname,
{
struct pex_obj *pex;
- pex = collect_execute (prog, argv, outname, errname);
+ pex = collect_execute (prog, argv, outname, errname, PEX_LAST | PEX_SEARCH);
return collect_wait (prog, pex);
}
@@ -729,7 +733,7 @@ scan_linker_output (const char *fname)
if (sym && sym->tweaked)
{
error ("'%s' was assigned to '%s', but was not defined "
- "during recompilation, or vice versa",
+ "during recompilation, or vice versa",
sym->key, sym->file->key);
fclose (stream);
return 0;
« no previous file with comments | « gcc/gcc/timevar.def ('k') | gcc/gcc/toplev.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698