* libsupc++/Makefile.am (LTCOMPILE): Add LIBSUPCXX_PICFLAGS.

	* libsupc++/Makefile.in: Regenerate.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index badeac4..bb81cae 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-07  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+       * libsupc++/Makefile.am (LTCOMPILE): Add LIBSUPCXX_PICFLAGS.
+       * libsupc++/Makefile.in: Regenerate.
+
 2002-08-05  Gabriel Dos Reis  <gdr@nerim.net>
 
        PR/7491

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 6348d69..451dbc3 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -126,7 +126,7 @@ dyn-string.o: dyn-string.c
 
 # LTCOMPILE is copied from LTCXXCOMPILE below.
 LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
-           $(DEFS) $(GCC_INCLUDES) \
+           $(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS) \
             $(AM_CPPFLAGS) $(CPPFLAGS) 
 
 

diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index b531d91..ace52e1 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -152,13 +152,11 @@ 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@ @DEBUG_FLAGS@ 
+CONFIG_CXXFLAGS =      @EXTRA_CXX_FLAGS@ @SECTION_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
@@ -166,42 +164,16 @@ GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include
 
-INCLUDES = \
-       $(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
+INCLUDES =     $(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
 
 
-headers = \
-       exception new typeinfo cxxabi.h exception_defines.h 
+headers =      exception new typeinfo cxxabi.h exception_defines.h 
 
 
-c_sources = \
-       cxa_demangle.c \
-       dyn-string.c 
+c_sources =    cxa_demangle.c  dyn-string.c 
 
 
-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 \
-       eh_type.cc \
-       new_handler.cc \
-       new_op.cc \
-       new_opnt.cc \
-       new_opv.cc \
-       new_opvnt.cc \
-       pure.cc \
-       tinfo.cc \
-       tinfo2.cc \
-       vec.cc
+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     eh_type.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) $(c_sources)
@@ -215,15 +187,11 @@ LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS)
 # Use special rules for pulling things out of libiberty.  These
 # objects should be compiled with the "C" compiler, not the C++
 # compiler, and also should not use the C++ includes.
-C_COMPILE = \
-       $(CC) $(DEFS) $(GCC_INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+C_COMPILE =    $(CC) $(DEFS) $(GCC_INCLUDES)   $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
 
 # LTCOMPILE is copied from LTCXXCOMPILE below.
-LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
-           $(DEFS) $(GCC_INCLUDES) \
-            $(AM_CPPFLAGS) $(CPPFLAGS) 
+LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC)          $(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS)             $(AM_CPPFLAGS) $(CPPFLAGS) 
 
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
@@ -231,12 +199,7 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
 # 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
@@ -260,9 +223,7 @@ AM_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
@@ -271,9 +232,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
 # 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 = 
@@ -312,7 +271,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libsupc__convenience_la_SOURCES) $(libsupc___la_SOURCES)
 OBJECTS = $(libsupc__convenience_la_OBJECTS) $(libsupc___la_OBJECTS)