summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2008-05-27 18:53:42 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2008-05-27 18:53:42 +0000
commitfce7c13c35f89a6156f2f13f6902d5339689f2a5 (patch)
treed44ca6d06ddd6901bcc6d609cbd9c425109badfc
parent86e45ce09e10777490158ee1df477f8c59e7ebc1 (diff)
Cope with the changes in the libiberty C++ demangler, and crank minor version
as the demangler provides new interfaces.
-rw-r--r--gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.am9
-rw-r--r--gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in7
-rw-r--r--gnu/lib/libstdc++/shlib_version2
3 files changed, 12 insertions, 6 deletions
diff --git a/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.am b/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.am
index 8d66e0ef048..7a02de77d79 100644
--- a/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.am
+++ b/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.am
@@ -111,10 +111,13 @@ C_COMPILE = \
cxa_demangle.c:
rm -f $@
- $(LN_S) $(toplevel_srcdir)/libiberty/cp-demangle.c $@
-cxa_demangle.lo: cxa_demangle.c
+ $(LN_S) $(LIBIBERTY_SRCDIR)/cp-demangle.c $@
+cp-demangle.h:
+ rm -f $@
+ $(LN_S) $(LIBIBERTY_SRCDIR)/cp-demangle.h $@
+cxa_demangle.lo: cxa_demangle.c cp-demangle.h
$(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
-cxa_demangle.o: cxa_demangle.c
+cxa_demangle.o: cxa_demangle.c cp-demangle.h
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
dyn-string.c:
rm -f $@
diff --git a/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in b/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in
index 1c9e460143b..bf7dd8358a3 100644
--- a/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in
+++ b/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in
@@ -572,9 +572,12 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
cxa_demangle.c:
rm -f $@
$(LN_S) $(LIBIBERTY_SRCDIR)/cp-demangle.c $@
-cxa_demangle.lo: cxa_demangle.c
+cp-demangle.h:
+ rm -f $@
+ $(LN_S) $(LIBIBERTY_SRCDIR)/cp-demangle.h $@
+cxa_demangle.lo: cxa_demangle.c cp-demangle.h
$(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
-cxa_demangle.o: cxa_demangle.c
+cxa_demangle.o: cxa_demangle.c cp-demangle.h
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
dyn-string.c:
rm -f $@
diff --git a/gnu/lib/libstdc++/shlib_version b/gnu/lib/libstdc++/shlib_version
index e539098e13f..2474c7166af 100644
--- a/gnu/lib/libstdc++/shlib_version
+++ b/gnu/lib/libstdc++/shlib_version
@@ -1,2 +1,2 @@
major=44
-minor=0
+minor=1