[libstdc++] Make use of runtime demangler

[Phil Edwards]

On Tue, Apr 30, 2002 at 12:20:42AM +0200, Franz Sirl wrote:
> > So, before we start reintroducing any of that, I have to wonder whether the
> > same problems -- presumably problems with shadow headers -- will still
> > occur. Probably not a fair question, since so much of our header setup has
> > changed in the last 18 months.
> 
> But why would one remove the whole of $(DEFS) just for the sake of removing a 
> single include?

I have no idea.  But I don't recall what problems we were experiencing at
the time.  (It was 18-odd months ago, I can't even remember when to go to
lunch from day to day.)


> Simply setting $(DEFS) as required in Makefile.am seems like 
> a lot simpler approach to me. Do you want to go with such an solution? I 
> would additionally add
> 
> # we need DEFS without -I$(srcdir)
> DEFS = @DEFS@ -I. -I..
> 
> to Makefile.am in my patch then.

Actually, we shouldn't even need the -I switches, since we're not adding
them back in anywhere else, I /think/.  There are probably some multilib
issues here.

I stuck the DEFS definition as shown below; it seemed to make the most
sense there.  Would you be willing to add that change to your patch and
retest?  Probably a retest isn't necessary, but I'm once-bitten-twice-shy
when playing with variables that can be automatically set by automake.
I think the patch can go in after that.

(Comments, Mark, Benjamin, anyone?)


Index: src/Makefile.am
===================================================================
RCS file: /home/pme/Repositories/GCC/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.105
diff -u -3 -r1.105 Makefile.am
--- src/Makefile.am	19 Mar 2002 19:50:28 -0000	1.105
+++ src/Makefile.am	30 Apr 2002 23:33:23 -0000
@@ -36,6 +36,7 @@
 # Compile flags that should be constant throughout the build, both for
 # SUBDIRS and for libstdc++-v3 in general.
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
+DEFS = @DEFS@
 
 # These bits are all figured out from configure. Look in acinclude.m4
 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
Index: libsupc++/Makefile.am
===================================================================
RCS file: /home/pme/Repositories/GCC/gcc/libstdc++-v3/libsupc++/Makefile.am,v
retrieving revision 1.30
diff -u -3 -r1.30 Makefile.am
--- libsupc++/Makefile.am	1 Apr 2002 21:56:42 -0000	1.30
+++ libsupc++/Makefile.am	30 Apr 2002 23:36:48 -0000
@@ -44,6 +44,7 @@
 # Compile flags that should be constant throughout the build, both for
 # SUBDIRS and for libstdc++-v3 in general.
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
+DEFS = @DEFS@
 
 # These bits are all figured out from configure. Look in acinclude.m4
 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS