diff options
author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-04 07:17:41 +0000 |
---|---|---|
committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-04 07:17:41 +0000 |
commit | 14f02f29c87a1dad04bce2f4e73f81c13322e114 (patch) | |
tree | 05ab7e1771a466532857290dfb50157c94856ccb /gcc/collect2.c | |
parent | 110557507c069b5d503b683d0ea74debd893e025 (diff) | |
download | gcc-14f02f29c87a1dad04bce2f4e73f81c13322e114.tar.gz |
2010-01-04 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 155603
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@155605 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/collect2.c')
-rw-r--r-- | gcc/collect2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/collect2.c b/gcc/collect2.c index aa4b549b11b..b9bed6be9e0 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -1,7 +1,7 @@ /* Collect static initialization info into data structures that can be traversed by C++ initialization and finalization routines. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Chris Smith (csmith@convex.com). Heavily modified by Michael Meissner (meissner@cygnus.com), @@ -2634,8 +2634,8 @@ scan_prog_file (const char *prog_name, scanpass which_pass, the LTO objects list if found. */ for (p = buf; (ch = *p) != '\0' && ch != '\n'; p++) if (ch == ' ' - && (strncmp (p +1 , "gnu_lto_v1", 10) == 0) - && ISSPACE( p[11])) + && (strncmp (p + 1, "__gnu_lto_v1", 12) == 0) + && ISSPACE (p[13])) { add_lto_object (<o_objects, prog_name); @@ -2849,7 +2849,7 @@ scan_libraries (const char *prog_name) /* Now iterate through the library list adding their symbols to the list. */ for (list = libraries.first; list; list = list->next) - scan_prog_file (list->name, PASS_LIB); + scan_prog_file (list->name, PASS_LIB, SCAN_ALL); } #endif /* LDD_SUFFIX */ |