X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fsrc%2FMakefile.am;h=973e75ff157d5979aa1e4b512c6c58123d297b4e;hb=3b6bba182d2ebb8a1c905ef7149f37e02fd11d11;hp=8ca4176d9f300d77c0f0eb67b75b8215d22803a7;hpb=6e77e3236833da984422d1c758e9d3188d9925c7;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 8ca4176d9f3..973e75ff157 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -1,6 +1,7 @@
 ## Makefile for the src subdirectory of the GNU C++ Standard library.
 ##
-## Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
+## Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
 ## Process this file with automake to produce Makefile.in.
@@ -18,284 +19,190 @@
 
 ## You should have received a copy of the GNU General Public License along
 ## with this library; see the file COPYING.  If not, write to the Free
-## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+## Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 ## USA.
 
-## $Id: Makefile.am,v 1.86 2001/06/01 09:22:05 hp Exp $
+include $(top_srcdir)/fragment.am
 
-AUTOMAKE_OPTIONS = 1.3 gnits
-MAINT_CHARSET = latin1
-
-mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
-
-# Cross compiler and multilib support.
-CXX = @glibcpp_CXX@
-toolexecdir = @glibcpp_toolexecdir@
-toolexeclibdir = @glibcpp_toolexeclibdir@
+# Cross compiler support.
 toolexeclib_LTLIBRARIES = libstdc++.la
 
-# Compile flags that should be constant throughout the build, both for
-# SUBDIRS and for libstdc++-v3 in general.
-OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
-
-# 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
-# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
-CONFIG_CXXFLAGS = \
-	@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
-
-# Warning flags to use.
-WARN_CXXFLAGS = \
-	@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
-
-# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
-GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
-C_INCLUDE_DIR = @C_INCLUDE_DIR@
-CSTD_INCLUDES = @CSTD_INCLUDES@
-LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
-LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
-LIBIO_INCLUDES = @LIBIO_INCLUDES@
-TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
-
-INCLUDES = \
-	-nostdinc++ \
-	-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \
-	$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
-	$(TOPLEVEL_INCLUDES)
-
-base_headers = \
-	bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h \
-	bits/stringfwd.h bits/std_string.h bits/basic_string.h \
-	bits/basic_string.tcc \
-	bits/generic_shadow.h bits/std_utility.h \
-	bits/std_complex.h \
-	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \
-	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \
-	bits/gslice.h bits/gslice_array.h bits/indirect_array.h \
-	bits/std_fstream.h bits/std_iomanip.h \
-	bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc \
-	bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h \
-	bits/std_istream.h bits/istream.tcc bits/std_locale.h \
-	bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc \
-	bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h \
-	bits/streambuf.tcc bits/basic_file.h \
-	bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h \
-	bits/stl_pthread_alloc.h bits/pthread_allocimpl.h \
-	bits/stl_threads.h \
-	bits/stl_iterator_base_types.h bits/stl_iterator_base_funcs.h \
-	bits/std_bitset.h bits/std_deque.h bits/std_functional.h \
-	bits/std_iterator.h bits/std_list.h \
-	bits/std_map.h bits/std_memory.h bits/std_numeric.h \
-	bits/std_queue.h bits/std_set.h bits/std_stack.h \
-	bits/std_stdexcept.h bits/functexcept.h bits/std_vector.h \
-	bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h \
-	bits/stl_deque.h bits/stl_function.h \
-	bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h \
-	bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h \
-	bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h \
-	bits/stl_relops.h bits/stl_set.h bits/stl_stack.h bits/stl_tempbuf.h \
-	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
-	bits/stl_bvector.h bits/type_traits.h bits/std_algorithm.h \
-	bits/stl_construct.h bits/boost_concept_check.h bits/concept_check.h
-
-
-backward_headers = \
-	backward/complex.h backward/iomanip.h backward/istream.h \
-	backward/ostream.h backward/stream.h backward/streambuf.h \
-	backward/algo.h backward/algobase.h backward/alloc.h \
-	backward/bvector.h backward/defalloc.h backward/deque.h \
-	backward/function.h backward/hash_map.h backward/hash_set.h \
-	backward/hashtable.h backward/heap.h backward/iostream.h \
-	backward/iterator.h backward/list.h backward/map.h \
-	backward/multimap.h backward/new.h backward/multiset.h \
-	backward/pair.h backward/queue.h backward/rope.h backward/set.h \
-	backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h \
-	backward/vector.h backward/fstream.h backward/strstream.h \
-	backward/strstream backward/backward_warning.h
-
-ext_headers = \
-	ext/rope ext/ropeimpl.h ext/stl_rope.h \
-	ext/slist ext/hash_map ext/hash_set \
-	ext/stl_hashtable.h ext/stl_hash_fun.h 
-
-c_base_headers = \
-	bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h \
-	bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h \
-	bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h \
-	bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h \
-	bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h \
-	bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc
-
-if GLIBCPP_USE_CSHADOW
-c_shadow_headers = \
-	assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h \
-	signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h \
-	wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h \
-	features.h langinfo.h \
-	bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h \
-	bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h \
-	bits/wrap_features.h bits/wrap_langinfo.h \
-	sys/cdefs.h 
-else
-c_shadow_headers =
-endif
+# Symbol versioning for shared libraries.
+if ENABLE_SYMVERS
+libstdc++-symbols.ver:  ${glibcxx_srcdir}/$(SYMVER_FILE) \
+		$(port_specific_symbol_files)
+	cp ${glibcxx_srcdir}/$(SYMVER_FILE) ./libstdc++-symbols.ver
+	if test "x$(port_specific_symbol_files)" != x; then \
+	  sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
+	  sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
+	  cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
+	  rm tmp.top tmp.bottom; \
+	fi
 
-std_headers = \
-	algorithm bitset complex deque fstream functional \
-	iomanip ios iosfwd iostream istream iterator limits list locale \
-	map memory numeric ostream queue set sstream stack stdexcept \
-	streambuf string utility valarray vector \
-	cassert cctype cerrno cfloat climits clocale ciso646 \
-	cmath csetjmp csignal cstdarg cstddef cstdio cstdlib \
-	cstring ctime cwchar cwctype
-
-if GLIBCPP_NEED_LIBIO 
-libio_headers = \
-	$(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
+if ENABLE_SYMVERS_GNU
+version_arg = -Wl,--version-script=libstdc++-symbols.ver
+version_dep = libstdc++-symbols.ver
+endif
+if ENABLE_SYMVERS_GNU_NAMESPACE
+version_arg = -Wl,--version-script=libstdc++-symbols.ver
+version_dep = libstdc++-symbols.ver
+endif
+if ENABLE_SYMVERS_DARWIN
+version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
+version_dep = libstdc++-symbols.explist
+libstdc++-symbols.explist : libstdc++-symbols.ver \
+		${glibcxx_srcdir}/scripts/make_exports.pl \
+		$(libstdc___la_OBJECTS) $(libstdc___la_LIBADD)
+	perl ${glibcxx_srcdir}/scripts/make_exports.pl \
+	  libstdc++-symbols.ver \
+	  $(libstdc___la_OBJECTS:%.lo=.libs/%.o) \
+	 `echo $(libstdc___la_LIBADD) | \
+	    sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
+	 > $@ || (rm -f $@ ; exit 1)
+endif
 else
-libio_headers =
+version_arg =
+version_dep =
 endif
 
-build_headers = \
-	bits/std_limits.h \
-	bits/c++config.h bits/c++io.h bits/c++locale.h \
-	bits/gthr.h bits/gthr-single.h bits/gthr-default.h \
-	bits/basic_file_model.h \
-	bits/atomicity.h bits/os_defines.h \
-	bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h 
 
-sources = \
-	limitsMEMBERS.cc \
-	stdexcept.cc functexcept.cc bitset.cc \
-	globals.cc \
-	basic_file.cc ios.cc complex_io.cc strstream.cc \
-	c++locale.cc locale.cc localename.cc codecvt.cc \
-	locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc \
-	string-inst.cc wstring-inst.cc 
+# Source files linked in via configuration/make substitution for a
+# particular host.
+host_sources = \
+	atomicity.cc \
+	codecvt_members.cc \
+	collate_members.cc \
+	ctype_members.cc \
+	messages_members.cc \
+	monetary_members.cc \
+	numeric_members.cc \
+	time_members.cc 
+
+codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CCODECVT_CC) . || true
+
+collate_members.cc: ${glibcxx_srcdir}/$(CCOLLATE_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CCOLLATE_CC) . || true
+
+ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CCTYPE_CC) . || true
+
+messages_members.cc: ${glibcxx_srcdir}/$(CMESSAGES_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_CC) . || true
+
+monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
+
+numeric_members.cc: ${glibcxx_srcdir}/$(CNUMERIC_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CNUMERIC_CC) . || true
+
+time_members.cc: ${glibcxx_srcdir}/$(CTIME_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CTIME_CC) . || true
+
+atomicity_file = ${glibcxx_srcdir}/$(ATOMICITY_SRCDIR)/atomicity.h
+atomicity.cc: ${atomicity_file}
+	$(LN_S) ${atomicity_file} ./atomicity.cc || true
 
+# Source files linked in via configuration/make substitution for a
+# particular host, but with ad hoc naming rules.
+host_sources_extra = \
+	basic_file.cc \
+	c++locale.cc
 
-VPATH = $(top_srcdir):$(top_srcdir)/src:$(GLIBCPP_INCLUDE_DIR):$(GLIBCPP_INCLUDE_DIR)/std:$(C_INCLUDE_DIR)
+c++locale.cc: ${glibcxx_srcdir}/$(CLOCALE_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(CLOCALE_CC) ./$@ || true
+
+basic_file.cc: ${glibcxx_srcdir}/$(BASIC_FILE_CC)
+	$(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_CC) ./$@ || true
+
+# Sources present in the src directory.
+sources = \
+	bitmap_allocator.cc \
+	pool_allocator.cc \
+	mt_allocator.cc \
+	codecvt.cc \
+	compatibility.cc \
+	complex_io.cc \
+	ctype.cc \
+	debug.cc \
+	debug_list.cc \
+	functexcept.cc \
+	globals_locale.cc \
+	globals_io.cc \
+	ios.cc \
+	ios_failure.cc \
+	ios_init.cc \
+	ios_locale.cc \
+	limits.cc \
+	list.cc \
+	locale.cc \
+	locale_init.cc \
+	locale_facets.cc \
+	localename.cc \
+	stdexcept.cc \
+	strstream.cc \
+	tree.cc \
+	allocator-inst.cc \
+	concept-inst.cc \
+	fstream-inst.cc \
+	ext-inst.cc \
+	ios-inst.cc \
+	iostream-inst.cc \
+	istream-inst.cc \
+	istream.cc \
+	locale-inst.cc \
+	locale-misc-inst.cc \
+	misc-inst.cc \
+	ostream-inst.cc \
+	sstream-inst.cc \
+	streambuf-inst.cc \
+	streambuf.cc \
+	string-inst.cc \
+	valarray-inst.cc \
+	wlocale-inst.cc \
+	wstring-inst.cc \
+	${host_sources} \
+	${host_sources_extra}
+
+VPATH = $(top_srcdir)/src:$(top_srcdir)
 
 libstdc___la_SOURCES = $(sources)
 
 libstdc___la_LIBADD = \
-	../libmath/libmath.la @libio_la@ \
-	../libsupc++/libsupc++convenience.la
-
-libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
+	$(top_builddir)/libmath/libmath.la \
+	$(top_builddir)/libsupc++/libsupc++convenience.la
 
-libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
+libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
 
+libstdc___la_LDFLAGS = \
+	-version-info $(libtool_VERSION) ${version_arg} -lm 
 
 # Use special rules for the deprecated source files so that they find
 # deprecated include files.
+GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include
 strstream.lo: strstream.cc
-	$(LTCXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
+	$(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
 strstream.o: strstream.cc
-	$(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
-
-# Make sure cshadow headers are built first.
-if GLIBCPP_USE_CSHADOW
-CSHADOW_H = $(top_builddir)/stamp-cshadow
-else
-CSHADOW_H =
-endif
-
-# Specify that all *.o's depend on this.
-$(libstdc___la_OBJECTS): $(CSHADOW_H)
-
-$(top_builddir)/stamp-cshadow: $(top_srcdir)/mkinclosure \
-	                       $(top_srcdir)/mkcshadow
-	$(top_srcdir)/mkinclosure \
-	"-I $(top_builddir)/../../gcc/include -I /usr/include -G fcntl.h unistd.h" | $(top_srcdir)/mkcshadow;
-	rm -f  $(top_builddir)/stamp-cshadow 
-	echo "done" > $(top_builddir)/stamp-cshadow 
-
-
-# Check for various configure bits that change where the headers get installed.
-gxx_include_dir = @gxx_include_dir@
-gxx_target_include_dir = $(gxx_include_dir)/$(target_alias)
-
-# We have our own special, ridiculously complicated installation routine
-# here, as automake/autoconf is currently brain-damaged when it comes
-# to installing sub-directories of headers. In particular, we want to
-# 1) install build headers from (blddir)/include/bits -> (install)/bits
-# 2) install source headers from
-#      (srcdir)/include/bits -> (install)/bits
-#      (srcdir)/include/ext -> (install)/ext
-#      (srcdir)/include/backward -> (install)/backward
-#      ... and the always entertaining "C" compatibility bits
-#      where * represents configure-time directory switching
-#      (srcdir)/include/c* -> (install)/
-#      (srcdir)/include/c*/bits -> (install)/bits
-#      (srcdir)/include/c*/sys -> (install)/sys
-install-data-local: myinstalldirs myinstallheaders
-
-# NB: installation of shadow header directories is not attempted.
-myinstalldirs:
-	if test -z "$(MULTISUBDIR)"; then \
-	$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/backward; \
-	$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/bits; \
-	$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/ext; \
-	$(mkinstalldirs) $(DESTDIR)$(gxx_target_include_dir)/bits; \
-	fi
-
-# NB: As libio_headers may be empty, need this to make sure bash doesn't
-# choke on an empty for... loop by using libio_headers_install
-# NB: installation of shadow headers is not attempted.
-src_incdir = @GLIBCPP_INCLUDE_DIR@
-bld_incdir = $(top_builddir)/include
-c_incdir = @C_INCLUDE_DIR@
-myinstallheaders: 
-	if test -z "$(MULTISUBDIR)"; then \
-	for i in $(base_headers); do \
-	echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/";\
-	  $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/; \
-	done; \
-	for i in $(ext_headers); do \
-	echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/";\
-	  $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/; \
-	done; \
-	for i in $(backward_headers); do \
-	echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/";\
-	  $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/; \
-	done; \
-	for i in $(c_base_headers); do \
-	echo "$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/";\
-	  $(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/; \
-	done; \
-	for i in $(std_headers); do \
-	echo "$(INSTALL_DATA) $(src_incdir)/std/$$i $(gxx_include_dir)";\
-	  $(INSTALL_DATA) $(src_incdir)/std/$$i $(gxx_include_dir); \
-	done; \
-	for i in $(build_headers); do \
-	echo "$(INSTALL_DATA) $(bld_incdir)/$$i \
-	  $(gxx_target_include_dir)/bits/"; $(INSTALL_DATA) \
-	  $(bld_incdir)/$$i $(gxx_target_include_dir)/bits/; \
-	done; \
-	libio_headers_install='$(libio_headers)'; \
-	for i in $$libio_headers_install; do \
-	echo "$(INSTALL_DATA) $$i $(gxx_include_dir)"; \
-	  $(INSTALL_DATA) $$i $(gxx_include_dir); \
-	done; \
-	fi;
+	$(CXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
 
+# Use special rules for the concept-checking instantiations so that all
+# the generated template functions are also instantiated.  Force the checks
+# to be on so that the instantiations are actually seen.
+concept-inst.lo: concept-inst.cc
+	$(LTCXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
+concept-inst.o: concept-inst.cc
+	$(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
-# as the occasion call for it. (ie, --enable-debug)
-#
-# The no-implicit-templates flag will generate unresolved references to
-# the concept-checking symbols.  So we must disable the checks while
-# actually building the library.
+# as the occasion calls for it.
 AM_CXXFLAGS = \
 	-fno-implicit-templates \
-	$(LIBSUPCXX_CXXFLAGS) \
 	$(WARN_CXXFLAGS) \
 	$(OPTIMIZE_CXXFLAGS) \
-	$(CONFIG_CXXFLAGS) 
+	$(CONFIG_CXXFLAGS)
 
 
 # libstdc++ libtool notes
@@ -317,7 +224,9 @@ AM_CXXFLAGS = \
 # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
 # attempt to infer which configuration to use
 LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
-	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+	       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 
+
+LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 
 # 3) We'd have a problem when building the shared libstdc++ object if
 # the rules automake generates would be used.  We cannot allow g++ to
@@ -326,4 +235,38 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
 # directory to configure libstdc++-v3 to use gcc as the C++
 # compilation driver.
 CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
-	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
+
+
+# Added bits to build debug library.
+if GLIBCXX_BUILD_DEBUG
+all-local: build_debug
+install-data-local: install_debug
+else
+all-local:
+install-data-local:
+endif
+
+debugdir = debug
+
+# Build parallel set of debug objects here.
+stamp-debug:
+	if test ! -d ${debugdir}; then \
+	  mkdir -p ${debugdir}; \
+	  (cd ${debugdir}; \
+	  sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
+	      -e 's/srcdir = \.\./srcdir = ..\/../' \
+	      -e 's/glibcxx_basedir = \.\./glibcxx_basedir = ..\/../' \
+	      -e 's/all-local: build_debug/all-local:/' \
+	      -e 's/install-data-local: install_debug/install-data-local:/' \
+	  < ../Makefile > Makefile) ; \
+	fi; \
+	echo `date` > stamp-debug;
+
+build_debug: stamp-debug
+	(cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' all)
+
+# Install debug library here.
+install_debug:
+	(cd ${debugdir} && $(MAKE) \
+	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)