OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

collect2.c (main): Set COLLECT_NO_DEMANGLE for subprocesses. 

* collect2.c (main): Set COLLECT_NO_DEMANGLE for subprocesses.
        (dump_file): Only pad the demangled name with spaces if the
        mangled name was padded with spaces.

From-SVN: r43903
This commit is contained in:
Jason Merrill 2001-07-10 11:39:29 -04:00 committed by Jason Merrill
parent fd052ec378
commit 84db136d7c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2001-07-10 Jason Merrill <jason_merrill@redhat.com>
* collect2.c (main): Set COLLECT_NO_DEMANGLE for subprocesses.
(dump_file): Only pad the demangled name with spaces if the
mangled name was padded with spaces.
2001-07-10 Bernd Schmidt <bernds@redhat.com>
* bb-reorder.c (make_reorder_chain_1): Correct branch/fallthru

12
gcc/collect2.c
View File

@ -163,6 +163,10 @@ int do_collecting = 1;
#else
int do_collecting = 0;
#endif
/* Nonzero if we should suppress the automatic demangling of identifiers
in linker error messages. Set from COLLECT_NO_DEMANGLE. */
int no_demangle;
/* Linked lists of constructor and destructor names. */
@ -522,7 +526,6 @@ dump_file (name)
const char *name;
{
FILE *stream = fopen (name, "r");
int no_demangle = !! getenv ("COLLECT_NO_DEMANGLE");
if (stream == 0)
return;
@ -556,7 +559,7 @@ dump_file (name)
fputs (result, stderr);
diff = strlen (word) - strlen (result);
while (diff > 0)
while (diff > 0 && c == ' ')
--diff, putc (' ', stderr);
while (diff < 0 && c == ' ')
++diff, c = getc (stream);
@ -858,6 +861,11 @@ main (argc, argv)
int first_file;
int num_c_args = argc+9;
no_demangle = !! getenv ("COLLECT_NO_DEMANGLE");
/* Suppress demangling by the real linker, which may be broken. */
putenv (xstrdup ("COLLECT_NO_DEMANGLE="));
#if defined (COLLECT2_HOST_INITIALIZATION)
/* Perform system dependent initialization, if neccessary. */
COLLECT2_HOST_INITIALIZATION;