mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-27 05:24:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

tlink.c (scan_linker_output): Parse linker messages from darwin9's linker better.

Browse Source 
* tlink.c (scan_linker_output): Parse linker messages from
	darwin9's linker better.

From-SVN: r122283
This commit is contained in:
Mike Stump 2007-02-24 00:30:30 +00:00 committed by Mike Stump
parent a2266ea92b
commit 196bea21f1
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2007-02-23 Mike Stump <mrs@apple.com>
* tlink.c (scan_linker_output): Parse linker messages from
darwin9's linker better.
2007-02-23 Steve Ellcey <sje@cup.hp.com>
PR debug/29614

21
gcc/tlink.c
View File

@ -607,12 +607,17 @@ scan_linker_output (const char *fname)
{
FILE *stream = fopen (fname, "r");
char *line;
int skip_next_line = 0;
while ((line = tfgets (stream)) != NULL)
{
char *p = line, *q;
symbol *sym;
int end;
int ok = 0;
if (skip_next_line)
continue;
while (*p && ISSPACE ((unsigned char) *p))
++p;
@ -654,6 +659,19 @@ scan_linker_output (const char *fname)
demangled *dem = 0;
q = 0;
/* On darwin9, we look for "foo" referenced from:\n.*\n */
if (strcmp (oldq, "referenced from:") == 0)
{
/* We have to remember that we found a symbol to tweak. */
ok = 1;
/* We actually want to start from the first word on the line. */
oldq = p;
/* Since the format is multiline, we have to skip the next line. */
skip_next_line = 1;
}
/* First try `GNU style'. */
p = strchr (oldq, '`');
if (p)
@ -681,7 +699,8 @@ scan_linker_output (const char *fname)
/* We need to check for certain error keywords here, or we would
mistakenly use GNU ld's "In function `foo':" message. */
if (q && (strstr (oldq, "ndefined")
if (q && (ok
|| strstr (oldq, "ndefined")
|| strstr (oldq, "nresolved")
|| strstr (oldq, "nsatisfied")
|| strstr (oldq, "ultiple")))