* configure.in (LIBSUPCXX_PICFLAGS): Set it to -prefer-pic or

-prefer-non-pic depending on whether libtool has shared libraries
enabled or disabled.
* libsupc++/Makefile.am (LIBSUPCXX_CXXFLAGS): Set to
$(LIBSUPCXX_PICFLAGS).
* configure, */Makefile.in: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41806 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 49a8cf8..a253d44 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-03  Alexandre Oliva  <aoliva@redhat.com>
+
+       * configure.in (LIBSUPCXX_PICFLAGS): Set it to -prefer-pic or
+       -prefer-non-pic depending on whether libtool has shared libraries
+       enabled or disabled.
+       * libsupc++/Makefile.am (LIBSUPCXX_CXXFLAGS): Set to
+       $(LIBSUPCXX_PICFLAGS).
+       * configure, */Makefile.in: Rebuilt.
+
 2001-05-01  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/sbuf_iter.h (istreambuf_iterator): Correct.

diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 8777d1f..1e9acd7 100644 (file)
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -84,6 +84,7 @@ LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSTRINGOBJS = @LIBSTRINGOBJS@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
+LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -136,7 +137,43 @@ MULTICLEAN = true
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS =         "AR_FLAGS=$(AR_FLAGS)"  "CC_FOR_BUILD=$(CC_FOR_BUILD)"  "CC_FOR_TARGET=$(CC_FOR_TARGET)"        "CFLAGS=$(CFLAGS)"      "CXXFLAGS=$(CXXFLAGS)"  "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)"  "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)"        "INSTALL=$(INSTALL)"    "INSTALL_DATA=$(INSTALL_DATA)"  "INSTALL_PROGRAM=$(INSTALL_PROGRAM)"    "INSTALL_SCRIPT=$(INSTALL_SCRIPT)"      "LDFLAGS=$(LDFLAGS)"    "LIBCFLAGS=$(LIBCFLAGS)"        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)"  "MAKE=$(MAKE)"  "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"         "PICFLAG=$(PICFLAG)"    "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)"      "SHELL=$(SHELL)"        "exec_prefix=$(exec_prefix)"    "infodir=$(infodir)"    "libdir=$(libdir)"      "includedir=$(includedir)"      "prefix=$(prefix)"      "tooldir=$(tooldir)"    "AR=$(AR)"      "AS=$(AS)"      "LD=$(LD)"      "LIBCFLAGS=$(LIBCFLAGS)"        "PICFLAG=$(PICFLAG)"    "RANLIB=$(RANLIB)"      "NM=$(NM)"      "NM_FOR_BUILD=$(NM_FOR_BUILD)"  "NM_FOR_TARGET=$(NM_FOR_TARGET)"        "DESTDIR=$(DESTDIR)"    "WERROR=$(WERROR)" 
+AM_MAKEFLAGS = \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+       "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+       "MAKE=$(MAKE)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+       "SHELL=$(SHELL)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "includedir=$(includedir)" \
+       "prefix=$(prefix)" \
+       "tooldir=$(tooldir)" \
+       "AR=$(AR)" \
+       "AS=$(AS)" \
+       "LD=$(LD)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "RANLIB=$(RANLIB)" \
+       "NM=$(NM)" \
+       "NM_FOR_BUILD=$(NM_FOR_BUILD)" \
+       "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+       "DESTDIR=$(DESTDIR)" \
+       "WERROR=$(WERROR)" 
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_HEADER = config.h

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index be7df7b..f27ce05 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -16773,6 +16773,14 @@ echo "$ac_t""$gxx_include_dir" 1>&6
   
 
 
+if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features |
+   grep "enable shared" > /dev/null; then
+  LIBSUPCXX_PICFLAGS=-prefer-pic
+else
+  LIBSUPCXX_PICFLAGS=
+fi
+
+
 # This should be done by mkincludedir, but hack around it now.
 blddir=`pwd`
 echo "checking for $blddir/include"
@@ -17003,6 +17011,7 @@ s%@LIBIO_INCLUDES@%$LIBIO_INCLUDES%g
 s%@CSTD_INCLUDES@%$CSTD_INCLUDES%g
 s%@OPTIMIZE_CXXFLAGS@%$OPTIMIZE_CXXFLAGS%g
 s%@WARN_FLAGS@%$WARN_FLAGS%g
+s%@LIBSUPCXX_PICFLAGS@%$LIBSUPCXX_PICFLAGS%g
 
 CEOF
 EOF

diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 838ce93..0201b20 100644 (file)
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -260,6 +260,14 @@ GLIBCPP_EXPORT_INSTALL_INFO
 GLIBCPP_EXPORT_INCLUDES
 GLIBCPP_EXPORT_FLAGS
 
+if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features |
+   grep "enable shared" > /dev/null; then
+  LIBSUPCXX_PICFLAGS=-prefer-pic
+else
+  LIBSUPCXX_PICFLAGS=
+fi
+AC_SUBST(LIBSUPCXX_PICFLAGS)
+
 # This should be done by mkincludedir, but hack around it now.
 blddir=`pwd`
 echo "checking for $blddir/include"

diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in
index ae7b755..5925349 100644 (file)
--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -79,6 +79,7 @@ GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBSTRINGOBJS = @LIBSTRINGOBJS@
+LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -112,7 +113,7 @@ toplevel_srcdir = @toplevel_srcdir@
 AUTOMAKE_OPTIONS = 1.3 cygnus
 
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
-@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la
+@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la
 @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = 
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -124,14 +125,21 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
 
-INCLUDES =     -nostdinc++     -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR)      $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)  
+INCLUDES = \
+       -nostdinc++ \
+       -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \
+       $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)  
 
 
-libio_headers =          libio.h libioP.h iolibio.h
+libio_headers = \
+        libio.h libioP.h iolibio.h
 
-@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS =  filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c         iofclose.c iofopen.c 
+@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\
+@GLIBCPP_NEED_LIBIO_TRUE@      filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \
+@GLIBCPP_NEED_LIBIO_TRUE@      iofclose.c iofopen.c 
 @GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS = 
-@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS =        wfiledoalloc.c wfileops.c wgenops.c iofwide.c
+@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\
+@GLIBCPP_NEED_WLIBIO_TRUE@     wfiledoalloc.c wfileops.c wgenops.c iofwide.c
 @GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = 
 
 EXTRA_DIST = iostreamP.h

diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index b8140f3..5465e6f 100644 (file)
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -79,6 +79,7 @@ GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBSTRINGOBJS = @LIBSTRINGOBJS@
+LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -115,18 +116,24 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 noinst_LTLIBRARIES = libmath.la
 
-EXTRA_LONG_DOUBLE_yes =        hypotl.c signbitl.c
+EXTRA_LONG_DOUBLE_yes = \
+       hypotl.c signbitl.c
 
 
-EXTRA_DIST =   hypot.c hypotf.c atan2f.c expf.c        $(EXTRA_LONG_DOUBLE_yes) 
+EXTRA_DIST = \
+       hypot.c hypotf.c atan2f.c expf.c \
+       $(EXTRA_LONG_DOUBLE_yes) 
 
 
-libmath_la_LIBADD =    @LIBMATHOBJS@   $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
+libmath_la_LIBADD = \
+       @LIBMATHOBJS@ \
+       $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
 
 
 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
-libmath_la_SOURCES =   signbit.c signbitf.c
+libmath_la_SOURCES = \
+       signbit.c signbitf.c
 
 
 LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -140,7 +147,9 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
 
-INCLUDES =     -I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include      $(TOPLEVEL_INCLUDES) 
+INCLUDES = \
+       -I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include  \
+       $(TOPLEVEL_INCLUDES) 
 
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 77606c6..c3d40ce 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -100,7 +100,7 @@ libsupc__convenience_la_SOURCES = $(sources)
 glibcppinstalldir = @gxx_include_dir@
 glibcppinstall_HEADERS = $(headers)
 
-LIBSUPCXX_CXXFLAGS = -prefer-pic
+LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS)
 
 # 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

diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 6a13b48..e02b34f 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -77,6 +77,7 @@ GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBSTRINGOBJS = @LIBSTRINGOBJS@
+LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -130,11 +131,13 @@ 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@ 
+CONFIG_CXXFLAGS = \
+       @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
 
 
 # Warning flags to use.
-WARN_CXXFLAGS =        @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
+WARN_CXXFLAGS = \
+       @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
 
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -146,13 +149,38 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
-INCLUDES =     -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include   -I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include      $(LIBSUPCXX_INCLUDES)
-
-
-headers =      exception new typeinfo cxxabi.h exception_defines.h 
-
-
-sources =      del_op.cc       del_opnt.cc     del_opv.cc      del_opvnt.cc    eh_alloc.cc     eh_aux_runtime.cc       eh_catch.cc     eh_exception.cc         eh_globals.cc   eh_personality.cc       eh_terminate.cc         eh_throw.cc     new_handler.cc  new_op.cc       new_opnt.cc     new_opv.cc      new_opvnt.cc    pure.cc         tinfo.cc        tinfo2.cc       vec.cc
+INCLUDES = \
+       -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include \
+       -I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \
+        $(LIBSUPCXX_INCLUDES)
+
+
+headers = \
+       exception new typeinfo cxxabi.h exception_defines.h 
+
+
+sources = \
+       del_op.cc \
+       del_opnt.cc \
+       del_opv.cc \
+       del_opvnt.cc \
+       eh_alloc.cc \
+       eh_aux_runtime.cc \
+       eh_catch.cc \
+       eh_exception.cc \
+       eh_globals.cc \
+       eh_personality.cc \
+       eh_terminate.cc \
+       eh_throw.cc \
+       new_handler.cc \
+       new_op.cc \
+       new_opnt.cc \
+       new_opv.cc \
+       new_opvnt.cc \
+       pure.cc \
+       tinfo.cc \
+       tinfo2.cc \
+       vec.cc
 
 
 libsupc___la_SOURCES = $(sources)
@@ -161,14 +189,19 @@ libsupc__convenience_la_SOURCES = $(sources)
 glibcppinstalldir = @gxx_include_dir@
 glibcppinstall_HEADERS = $(headers)
 
-LIBSUPCXX_CXXFLAGS = -prefer-pic
+LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS)
 
 # 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)
-AM_CXXFLAGS =          -fno-implicit-templates         $(LIBSUPCXX_CXXFLAGS)   $(WARN_CXXFLAGS)        $(OPTIMIZE_CXXFLAGS)    $(CONFIG_CXXFLAGS) 
+AM_CXXFLAGS = \
+       -fno-implicit-templates \
+       $(LIBSUPCXX_CXXFLAGS) \
+       $(WARN_CXXFLAGS) \
+       $(OPTIMIZE_CXXFLAGS) \
+       $(CONFIG_CXXFLAGS) 
 
 
 # libstdc++ libtool notes
@@ -192,7 +225,9 @@ AM_CXXFLAGS =       -fno-implicit-templates         $(LIBSUPCXX_CXXFLAGS)   $(WARN_CXXFLAGS)
 #
 # We have to put --tag disable-shared after --tag CXX lest things
 # CXX undo the affect of disable-shared.
-LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared                --mode=compile $(CXX) $(INCLUDES)             $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
+               --mode=compile $(CXX) $(INCLUDES) \
+              $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
 
 
 # 3) We'd have a problem when building the shared libstdc++ object if
@@ -201,7 +236,9 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared                --mode=c
 # course is problematic at this point.  So, we get the top-level
 # directory to configure libstdc++-v3 to use gcc as the C++
 # compilation driver.
-CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared           --mode=link $(CXX)           @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
+          --mode=link $(CXX) \
+          @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index d232ad0..a3ea2b5 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -76,6 +76,7 @@ GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBSTRINGOBJS = @LIBSTRINGOBJS@
+LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -122,11 +123,13 @@ 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@ 
+CONFIG_CXXFLAGS = \
+       @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
 
 
 # Warning flags to use.
-WARN_CXXFLAGS =        @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
+WARN_CXXFLAGS = \
+       @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
 
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -138,44 +141,132 @@ 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
-
-@GLIBCPP_USE_CSHADOW_TRUE@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 
+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
+
+@GLIBCPP_USE_CSHADOW_TRUE@c_shadow_headers = @GLIBCPP_USE_CSHADOW_TRUE@\
+@GLIBCPP_USE_CSHADOW_TRUE@     assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     features.h langinfo.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     bits/wrap_features.h bits/wrap_langinfo.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     sys/cdefs.h 
 @GLIBCPP_USE_CSHADOW_FALSE@c_shadow_headers = 
 
-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
-
-@GLIBCPP_NEED_LIBIO_TRUE@libio_headers =       $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
+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
+
+@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = @GLIBCPP_NEED_LIBIO_TRUE@\
+@GLIBCPP_NEED_LIBIO_TRUE@      $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
 @GLIBCPP_NEED_LIBIO_FALSE@libio_headers = 
 
-build_headers =        bits/std_limits.h       bits/c++config.h bits/c++io.h bits/c++locale.h bits/c++threads.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 
+build_headers = \
+       bits/std_limits.h \
+       bits/c++config.h bits/c++io.h bits/c++locale.h bits/c++threads.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 
+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 
 
 VPATH =  $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR)  $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
 
 libstdc___la_SOURCES = $(sources)
 
-libstdc___la_LIBADD =          ../libmath/libmath.la @libio_la@        ../libsupc++/libsupc++convenience.la
+libstdc___la_LIBADD = \
+       ../libmath/libmath.la @libio_la@ \
+       ../libsupc++/libsupc++convenience.la
 
 
 libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
 
 libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
-@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = $(top_builddir)/stamp-cshadow
+@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = @GLIBCPP_USE_CSHADOW_TRUE@$(top_builddir)/stamp-cshadow
 @GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H = 
 
 # Check for various configure bits that change where the headers get installed.
@@ -198,7 +289,12 @@ c_incdir = @C_INCLUDE_DIR@
 # 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.
-AM_CXXFLAGS =          -fno-implicit-templates         $(LIBSUPCXX_CXXFLAGS)   $(WARN_CXXFLAGS)        $(OPTIMIZE_CXXFLAGS)    $(CONFIG_CXXFLAGS) 
+AM_CXXFLAGS = \
+       -fno-implicit-templates \
+       $(LIBSUPCXX_CXXFLAGS) \
+       $(WARN_CXXFLAGS) \
+       $(OPTIMIZE_CXXFLAGS) \
+       $(CONFIG_CXXFLAGS) 
 
 
 # libstdc++ libtool notes
@@ -219,7 +315,8 @@ AM_CXXFLAGS =       -fno-implicit-templates         $(LIBSUPCXX_CXXFLAGS)   $(WARN_CXXFLAGS)
 # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
 # 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) 
+LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
+              $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
 
 
 # 3) We'd have a problem when building the shared libstdc++ object if
@@ -228,7 +325,8 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES)              $(
 # course is problematic at this point.  So, we get the top-level
 # 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 $@
+CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
+         @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index edf9b18..5b618a5 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -84,6 +84,7 @@ LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSTRINGOBJS = @LIBSTRINGOBJS@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
+LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@