4c4
< Copyright (C) 1995, 1998 Free Software Foundation, Inc.
---
> Copyright (C) 1995, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
7c7
< This file is part of GNU CC.
---
> This file is part of GCC.
9,12c9,12
< GNU CC is free software; you can redistribute it and/or modify
< it under the terms of the GNU General Public License as published by
< the Free Software Foundation; either version 2, or (at your option)
< any later version.
---
> GCC is free software; you can redistribute it and/or modify it under
> the terms of the GNU General Public License as published by the Free
> Software Foundation; either version 2, or (at your option) any later
> version.
14,17c14,17
< GNU CC is distributed in the hope that it will be useful,
< but WITHOUT ANY WARRANTY; without even the implied warranty of
< MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
< GNU General Public License for more details.
---
> GCC is distributed in the hope that it will be useful, but WITHOUT ANY
> WARRANTY; without even the implied warranty of MERCHANTABILITY or
> FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> for more details.
20,22c20,22
< along with GNU CC; see the file COPYING. If not, write to
< the Free Software Foundation, 59 Temple Place - Suite 330,
< Boston, MA 02111-1307, USA. */
---
> along with GCC; see the file COPYING. If not, write to the Free
> Software Foundation, 59 Temple Place - Suite 330, Boston, MA
> 02111-1307, USA. */
25a26
> #include "intl.h"
28d28
< #include "toplev.h"
37,44d36
< /* Defined in collect2.c. */
< extern int vflag, debug;
< extern char *ldout;
< extern char *c_file_name;
< extern struct obstack temporary_obstack;
< extern struct obstack permanent_obstack;
< extern char * temporary_firstobj;
<
83c75
< boolean));
---
> int));
92c84
< demangled_hash_lookup PARAMS ((const char *, boolean));
---
> demangled_hash_lookup PARAMS ((const char *, int));
98,99c90,91
< static int tlink_execute PARAMS ((char *, char **, char *));
< static char * frob_extension PARAMS ((char *, const char *));
---
> static int tlink_execute PARAMS ((const char *, char **, const char *));
> static char * frob_extension PARAMS ((const char *, const char *));
118c110
< hash_table_key string;
---
> hash_table_key string ATTRIBUTE_UNUSED;
140c132
< boolean create;
---
> int create;
143,144c135,136
< hash_lookup (&symbol_table, (hash_table_key) string,
< create, &string_copy));
---
> hash_lookup (&symbol_table, (const hash_table_key) string,
> create, string_copy));
156c148
< hash_table_key string;
---
> hash_table_key string ATTRIBUTE_UNUSED;
180,181c172,173
< hash_lookup (&file_table, (hash_table_key) string, true,
< &string_copy));
---
> hash_lookup (&file_table, (const hash_table_key) string, true,
> string_copy));
193c185
< hash_table_key string;
---
> hash_table_key string ATTRIBUTE_UNUSED;
212c204
< boolean create;
---
> int create;
215,216c207,208
< hash_lookup (&demangled_table, (hash_table_key) string,
< create, &string_copy));
---
> hash_lookup (&demangled_table, (const hash_table_key) string,
> create, string_copy));
299c291
< char *p;
---
> const char *p;
301,304c293,296
< hash_table_init (&symbol_table, symbol_hash_newfunc, &string_hash,
< &string_compare);
< hash_table_init (&file_table, file_hash_newfunc, &string_hash,
< &string_compare);
---
> hash_table_init (&symbol_table, symbol_hash_newfunc, string_hash,
> string_compare);
> hash_table_init (&file_table, file_hash_newfunc, string_hash,
> string_compare);
306c298
< &string_hash, &string_compare);
---
> string_hash, string_compare);
325c317
< char *prog;
---
> const char *prog;
327c319
< char *redir;
---
> const char *redir;
335c327
< char *s;
---
> const char *s;
338c330
< char *p = rindex (s, '/');
---
> const char *p = strrchr (s, '/');
341c333
< p = rindex (p, '.');
---
> p = strrchr (p, '.');
394c386
< char *name = tfgets (stream);
---
> const char *name = tfgets (stream);
436c428
< fprintf (stderr, "collect: reading %s\n",
---
> fprintf (stderr, _("collect: reading %s\n"),
505a498,500
> putenv (xstrdup ("COMPILER_PATH"));
> putenv (xstrdup ("LIBRARY_PATH"));
>
510c505
< char *outname = frob_extension ((char*) f->root.key, ".rnw");
---
> const char *const outname = frob_extension ((char*) f->root.key, ".rnw");
537c532
< fprintf (stderr, "collect: recompiling %s\n", f->main);
---
> fprintf (stderr, _("collect: recompiling %s\n"), f->main);
562c557
< char *p = frob_extension (*object, ".rpo");
---
> const char *p;
564a560,565
> /* Don't bother trying for ld flags. */
> if (*object[0] == '-')
> continue;
>
> p = frob_extension (*object, ".rpo");
>
589c590
< char *p = cplus_demangle ((char*) sym->root.key,
---
> const char *p = cplus_demangle ((char*) sym->root.key,
634a636,649
> /* Some SVR4 linkers produce messages like
> ld: 0711-317 ERROR: Undefined symbol: .g__t3foo1Zi
> */
> if (! sym && ! end && strstr (q+1, "Undefined symbol: "))
> {
> char *p = strrchr (q+1, ' ');
> p++;
> if (*p == '.')
> p++;
> if (*p == '_' && prepends_underscore)
> p++;
> sym = symbol_hash_lookup (p, false);
> }
>
638c653
< char *oldq = q+1;
---
> const char *oldq = q+1;
643c658
< p = index (oldq, '`');
---
> p = strchr (oldq, '`');
645c660
< p++, q = index (p, '\'');
---
> p++, q = strchr (p, '\'');
647,648c662,663
< else if (p = index (oldq, '"'), p)
< p++, q = index (p, '"');
---
> else if (p = strchr (oldq, '"'), p)
> p++, q = strchr (p, '"');
650c665,675
< if (q)
---
> /* Don't let the strstr's below see the demangled name; we
> might get spurious matches. */
> if (p)
> p[-1] = '\0';
>
> /* 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")
> || strstr (oldq, "nresolved")
> || strstr (oldq, "nsatisfied")
> || strstr (oldq, "ultiple")))
673c698
< fprintf (stderr, "collect: tweaking %s in %s\n",
---
> fprintf (stderr, _("collect: tweaking %s in %s\n"),
697c722
< char **ld_argv, **object_lst;
---
> char **ld_argv, **object_lst ATTRIBUTE_UNUSED;
720c745
< fprintf (stderr, "collect: relinking\n");
---
> fprintf (stderr, _("collect: relinking\n"));