diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2002-09-11 19:58:02 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2002-09-11 19:58:02 +0000 |
| commit | 3fd9d606f3f68b72f7645400a79a8b09cc10a9e9 (patch) | |
| tree | 6bbcd2c0a0f2af2f4a8beb06f20dc3cdb8866ba7 /gcc/tlink.c | |
| parent | 6e471ea7b847f2a8bf4ee0673dc64a4156ec694e (diff) | |
| download | gcc-3fd9d606f3f68b72f7645400a79a8b09cc10a9e9.zip gcc-3fd9d606f3f68b72f7645400a79a8b09cc10a9e9.tar.gz gcc-3fd9d606f3f68b72f7645400a79a8b09cc10a9e9.tar.bz2 | |
Makefile.in: Remove all references to s-under and underscore.c.
gcc:
* Makefile.in: Remove all references to s-under and underscore.c.
* collect2.c, tlink.c: Change all uses of prepends_underscore
to look directly at USER_LABEL_PREFIX.
gcc/cp:
* Make-lang.in: Build cp/cxxfilt.o from $(srcdir)/cp/cxxfilt.c,
and c++filt from cxxfilt.o + version.o + $(LIBDEPS).
* cxxfilt.c: New file: split from libiberty/cplus-dem.c, with
minor adjustments (use version_string, eliminate yet another
duplicate of xmalloc)
libiberty:
* cplus-dem.c: Code code under #ifdef MAIN moved to gcc/cp/cxxfilt.c.
* testsuite/Makefile.in: Adjust for test-demangle.
* testsuite/regress-demangle: Deleted.
* testsuite/test-demangle.c: New file.
* testsuite/demangle-expected: Change \$ to $ throughout, now that
this file is not being read by a shell script.
From-SVN: r57037
Diffstat (limited to 'gcc/tlink.c')
| -rw-r--r-- | gcc/tlink.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gcc/tlink.c b/gcc/tlink.c index 21d82f75..4a56d48 100644 --- a/gcc/tlink.c +++ b/gcc/tlink.c @@ -595,8 +595,8 @@ scan_linker_output (fname) /* Try the first word on the line. */ if (*p == '.') ++p; - if (*p == '_' && prepends_underscore) - ++p; + if (!strncmp (p, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX))) + p += strlen (USER_LABEL_PREFIX); end = ! *q; *q = 0; @@ -611,8 +611,8 @@ scan_linker_output (fname) p++; if (*p == '.') p++; - if (*p == '_' && prepends_underscore) - p++; + if (!strncmp (p, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX))) + p += strlen (USER_LABEL_PREFIX); sym = symbol_hash_lookup (p, false); } @@ -649,8 +649,9 @@ scan_linker_output (fname) sym = symbol_hash_lookup (dem->mangled, false); else { - if (*p == '_' && prepends_underscore) - ++p; + if (!strncmp (p, USER_LABEL_PREFIX, + strlen (USER_LABEL_PREFIX))) + p += strlen (USER_LABEL_PREFIX); sym = symbol_hash_lookup (p, false); } } |