diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-01-14 19:39:37 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-01-14 19:39:37 +0000 |
| commit | 16aedcbd2d5546ceb2e80616ba738a8edd577064 (patch) | |
| tree | 5399874d74e14de73a5baf61938cc8e81787046d /gcc/cp | |
| parent | d721838658d4ee24af66c16dd8c42911b7cfd523 (diff) | |
Import of real gcc-2.8.0 sources.gcc-2_8_0-release
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc3@17354 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 15 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 5 | ||||
| -rw-r--r-- | gcc/cp/method.c | 8 |
3 files changed, 22 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 03f3806071d..e20b8af122b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +Mon Dec 22 17:46:17 1997 Mark Mitchell <mmitchell@usa.net> + + * method.c (build_overload_name): Fix mangling for __null. + +Sat Dec 13 09:23:54 1997 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> + + * Make-lang.in (g++.c, cxxmain.o): Use $(LN). + Wed Dec 3 08:47:27 1997 Paul Eggert <eggert@twinsun.com> * pt.c (check_explicit_specialization): Fix misspelling in @@ -6555,3 +6563,10 @@ Wed Oct 11 16:30:34 1995 Brendan Kehoe <brendan@lisa.cygnus.com> * parse.y (fn.def1): Call split_specs_attrs in declmods notype_declarator case. + +Use a consistent time stamp format in ChangeLog entries. +Not everyone has Emacs 20 yet, so stick with Emacs 19 format for now. + +Local Variables: +add-log-time-format: current-time-string +End: diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index deba6e22bd1..7646cf66bdf 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -74,7 +74,7 @@ C++ c++: cc1plus g++.c: $(srcdir)/gcc.c -rm -f $@ - ln -s $(srcdir)/gcc.c $@ || cp $(srcdir)/gcc.c $@ + $(LN) $(srcdir)/gcc.c $@ g++spec.o: $(srcdir)/cp/g++spec.c $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/cp/g++spec.c @@ -101,8 +101,7 @@ g++-cross$(exeext): g++$(exeext) cxxmain.o: cplus-dem.c demangle.h rm -f cxxmain.c - ln -s $(srcdir)/cplus-dem.c cxxmain.c > /dev/null 2>&1 \ - || cp $(srcdir)/cplus-dem.c cxxmain.c + $(LN) $(srcdir)/cplus-dem.c cxxmain.c $(CC) -c -DMAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -DVERSION=\"$(version)\" cxxmain.c rm -f cxxmain.c diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 0e407fe1ab8..dc57bc77a46 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1,6 +1,6 @@ /* Handle the hair of processing (but not expanding) inline functions. Also manage function and variable name overloading. - Copyright (C) 1987, 89, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. + Copyright (C) 1987, 89, 92-96, 1997 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. @@ -1039,8 +1039,10 @@ build_overload_name (parmtypes, begin, end) } case UNKNOWN_TYPE: - /* This will take some work. */ - OB_PUTC ('?'); + /* We can get here if __null is defined to have type ({unkown + type}*), which it is if -ansi is not used. Treat this + like 'void*'. */ + OB_PUTC ('v'); break; case TEMPLATE_TYPE_PARM: |