diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-11 19:58:02 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-11 19:58:02 +0000 |
| commit | 65e49ff14c9df445c8430a8cb54b833a2864b4f7 (patch) | |
| tree | 6bbcd2c0a0f2af2f4a8beb06f20dc3cdb8866ba7 /gcc/cp/Make-lang.in | |
| parent | 110a5ffd37b561f466eb08aca14076907503d512 (diff) | |
| download | gcc-65e49ff14c9df445c8430a8cb54b833a2864b4f7.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57037 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/Make-lang.in')
| -rw-r--r-- | gcc/cp/Make-lang.in | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 3235149ab05..a189b410485 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -82,16 +82,12 @@ g++-cross$(exeext): g++$(exeext) cp g++$(exeext) g++-cross$(exeext) # The demangler. -cxxmain.o: $(srcdir)/../libiberty/cplus-dem.c $(DEMANGLE_H) $(CONFIG_H) - rm -f cxxmain.c - $(LN_S) $(srcdir)/../libiberty/cplus-dem.c cxxmain.c - $(CC) -c -DMAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DVERSION=\"$(version)\" cxxmain.c +cp/cxxfilt.o: cp/cxxfilt.c $(DEMANGLE_H) $(CONFIG_H) $(SYSTEM_H) version.h # Apparently OpenVM needs the -o to be at the beginning of the link line. -$(DEMANGLER_PROG): cxxmain.o underscore.o $(LIBDEPS) +$(DEMANGLER_PROG): cp/cxxfilt.o version.o $(LIBDEPS) $(CC) -o $@ $(ALL_CFLAGS) $(LDFLAGS) \ - cxxmain.o underscore.o $(LIBS) + cp/cxxfilt.o version.o $(LIBS) # The compiler itself. # Shared with C front end: |