[multiple changes]

2000-11-03 David Edelsohn <dje@watson.ibm.com> * acinclude.m4 (GLIBCPP_CHECK_OS): Add AIX target selecting threads flag based on multilib definition of $CXX. * mknumeric_limits (LDFLAGS): Add AIX target linking with pthreads based on multilib definition of $CXX. * config/os/aix/bits/os_defines.h (_G_USING_THUNKS): Define as 0. 2000-11-03 Phil Edwards <pme@sources.redhat.com> * acinclude.m4: Cleanups. * aclocal.m4: Regenerated. * configure: Ditto. * Makefile.in: Ditto. * libio/Makefile.in: Ditto. * libmath/Makefile.in: Ditto. * libsupc++/Makefile.in: Ditto. * src/Makefile.in: Ditto. * docs/install.html: Removal of EGCS. * docs/23_containers/wrappers_h.txt: Likewise. * docs/faq/index.html: Likewise. * docs/faq/index.txt: Regenerated. * docs/thanks.html: More people. From-SVN: r37241

[multiple changes]
2000-11-03 David Edelsohn <dje@watson.ibm.com> * acinclude.m4 (GLIBCPP_CHECK_OS): Add AIX target selecting threads flag based on multilib definition of $CXX. * mknumeric_limits (LDFLAGS): Add AIX target linking with pthreads based on multilib definition of $CXX. * config/os/aix/bits/os_defines.h (_G_USING_THUNKS): Define as 0. 2000-11-03 Phil Edwards <pme@sources.redhat.com> * acinclude.m4: Cleanups. * aclocal.m4: Regenerated. * configure: Ditto. * Makefile.in: Ditto. * libio/Makefile.in: Ditto. * libmath/Makefile.in: Ditto. * libsupc++/Makefile.in: Ditto. * src/Makefile.in: Ditto. * docs/install.html: Removal of EGCS. * docs/23_containers/wrappers_h.txt: Likewise. * docs/faq/index.html: Likewise. * docs/faq/index.txt: Regenerated. * docs/thanks.html: More people. From-SVN: r37241
626d8f0a · Phil Edwards · 872865cf · 626d8f0a · 626d8f0a · 626d8f0a
Commit 626d8f0a authored Nov 04, 2000 by Phil Edwards
16 changed files
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+2000-11-03  David Edelsohn <dje@watson.ibm.com>
+
+	* acinclude.m4 (GLIBCPP_CHECK_OS): Add AIX target selecting threads
+	  flag based on multilib definition of $CXX.
+	* mknumeric_limits (LDFLAGS): Add AIX target linking with pthreads
+	  based on multilib definition of $CXX.
+	* config/os/aix/bits/os_defines.h (_G_USING_THUNKS): Define as 0.
+
+2000-11-03  Phil Edwards  <pme@sources.redhat.com>
+
+	* acinclude.m4:  Cleanups.
+	* aclocal.m4:  Regenerated.
+	* configure:  Ditto.
+	* Makefile.in:  Ditto.
+	* libio/Makefile.in:  Ditto.
+	* libmath/Makefile.in:  Ditto.
+	* libsupc++/Makefile.in:  Ditto.
+	* src/Makefile.in:  Ditto.
+
+	* docs/install.html:  Removal of EGCS.
+	* docs/23_containers/wrappers_h.txt:  Likewise.
+	* docs/faq/index.html:  Likewise.
+	* docs/faq/index.txt:  Regenerated.
+	* docs/thanks.html:  More people.
+
 2000-11-03  David Edelsohn  <edelsohn@gnu.org>

 	* include/c/bits/std_cwchar.h: Undefine macro that conflicts

--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -133,7 +133,48 @@ 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)" 	"EXPECT=$(EXPECT)" 	"RUNTEST=$(RUNTEST)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"includedir=$(includedir)" 	"prefix=$(prefix)" 	"tooldir=$(tooldir)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC)" 	"CXX=$(CXX)" 	"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)" \
+	"EXPECT=$(EXPECT)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"exec_prefix=$(exec_prefix)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"includedir=$(includedir)" \
+	"prefix=$(prefix)" \
+	"tooldir=$(tooldir)" \
+	"AR=$(AR)" \
+	"AS=$(AS)" \
+	"CC=$(CC)" \
+	"CXX=$(CXX)" \
+	"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
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs

--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -793,10 +793,21 @@ dnl are required for compilation, add them here.
 dnl 
 dnl GLIBCPP_CHECK_OS
 AC_DEFUN(GLIBCPP_CHECK_OS, [
-    AC_MSG_CHECKING([for os config directory])
+    AC_MSG_CHECKING([for OS config directory])
 # Currently unused, but could be useful.
 #    OS_FLAGS=
    case "${target_os}" in
+      aix4.[[3456789]]* | aix[[56789]]*)
+        os_include_dir="config/os/aix"
+        case "$CXX" in
+          *pthread*)
+            enable_threads='posix'
+            ;;
+          *)
+            enable_threads='no'
+            ;;
+        esac
+        ;;
      aix*)
        os_include_dir="config/os/aix"
        ;;
@@ -1443,12 +1454,9 @@ AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [
      *-*-linux* | sparc*-*-*)
        ATOMICITYH=$cpu_include_dir
        ;;    
-      *-*-aix*)
+      *-*-aix* | *-*-irix*)
        ATOMICITYH=$os_include_dir
        ;;
-      *-*-irix*)
-	ATOMICITYH=$os_include_dir
-	;;
      *)
        # bit of overkill on this text...
        AC_MSG_ERROR([Atomic locking requested, but $enable_threads is an unknown thread package and atomic operations are not present in the CPU])
@@ -1746,7 +1754,7 @@ AC_DEFUN(
          _cv_gnu_make_command='' ;
 dnl Search all the common names for GNU make
          for a in "${MAKE:-make}" make gmake gnumake ; do
-                  if ( $a --version 2> /dev/null | grep -c GNU )
+                  if ( $a --version 2> /dev/null | grep -c GNU > /dev/null )
                  then
                          _cv_gnu_make_command=$a ;
                          break;

--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -805,10 +805,21 @@ dnl are required for compilation, add them here.
 dnl 
 dnl GLIBCPP_CHECK_OS
 AC_DEFUN(GLIBCPP_CHECK_OS, [
-    AC_MSG_CHECKING([for os config directory])
+    AC_MSG_CHECKING([for OS config directory])
 # Currently unused, but could be useful.
 #    OS_FLAGS=
    case "${target_os}" in
+      aix4.[[3456789]]* | aix[[56789]]*)
+        os_include_dir="config/os/aix"
+        case "$CXX" in
+          *pthread*)
+            enable_threads='posix'
+            ;;
+          *)
+            enable_threads='no'
+            ;;
+        esac
+        ;;
      aix*)
        os_include_dir="config/os/aix"
        ;;
@@ -1455,12 +1466,9 @@ AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [
      *-*-linux* | sparc*-*-*)
        ATOMICITYH=$cpu_include_dir
        ;;    
-      *-*-aix*)
+      *-*-aix* | *-*-irix*)
        ATOMICITYH=$os_include_dir
        ;;
-      *-*-irix*)
-	ATOMICITYH=$os_include_dir
-	;;
      *)
        # bit of overkill on this text...
        AC_MSG_ERROR([Atomic locking requested, but $enable_threads is an unknown thread package and atomic operations are not present in the CPU])
@@ -1758,7 +1766,7 @@ AC_DEFUN(
          _cv_gnu_make_command='' ;
 dnl Search all the common names for GNU make
          for a in "${MAKE:-make}" make gmake gnumake ; do
-                  if ( $a --version 2> /dev/null | grep -c GNU )
+                  if ( $a --version 2> /dev/null | grep -c GNU > /dev/null )
                  then
                          _cv_gnu_make_command=$a ;
                          break;

--- a/libstdc++-v3/config/os/aix/bits/os_defines.h
+++ b/libstdc++-v3/config/os/aix/bits/os_defines.h
@@ -52,5 +52,8 @@
 #define __off64_t off64_t
 #define __ssize_t ssize_t

+#undef _G_USING_THUNKS
+#define _G_USING_THUNKS 0
+
 #endif

--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
--- a/libstdc++-v3/docs/23_containers/wrappers_h.txt
+++ b/libstdc++-v3/docs/23_containers/wrappers_h.txt
@@ -15,7 +15,7 @@
 * produces assembly code of
 *       mov 17,register0
 *       call ofstream_put
- * i.e., the template function inlining really does work; g++/egcs
+ * i.e., the template function inlining really does work; g++
 * requires -O3 (or -finline-functions) before it does this, though.
 *
 * pedwards 13Nov98

--- a/libstdc++-v3/docs/faq/index.html
+++ b/libstdc++-v3/docs/faq/index.html
@@ -13,7 +13,7 @@
  ** Locations of "the most recent snapshot is the Nth" text are 
  ** answers 1_1, 1_4, 4_1, 5_6.
 -->
-<!-- $Id: index.html,v 1.6 2000/09/25 21:42:14 pme Exp $ -->
+<!-- $Id: index.html,v 1.7 2000/10/21 00:51:50 jsm28 Exp $ -->
 </HEAD>
 <BODY>

@@ -134,7 +134,7 @@ HREF="http://gcc.gnu.org/gcc-2.95/buildstat.html">portability</A>
 <HR>
   <H2><A NAME="1_3">1.3 Who's in charge of it?</A></H2>
      <P>The libstdc++ project is contributed to by several developers
-         all over the world, in the same way as GCC (EGCS) or Linux.
+         all over the world, in the same way as GCC or Linux.
         Benjamin Kosnik, Gabriel Dos Reis, Nathan Myers, and Ulrich
         Drepper are the lead maintainers of the CVS archive.
      </P>
@@ -654,7 +654,7 @@ HREF="http://sources.redhat.com/ml/libstdc++/1999/msg00084.html">speculation</A>
 Comments and suggestions are welcome, and may be sent to
 <A HREF="mailto:pme@sources.redhat.com">Phil Edwards</A> or
 <A HREF="mailto:gdr@gcc.gnu.org">Gabriel Dos Reis</A>.
-<BR> $Id: index.html,v 1.6 2000/09/25 21:42:14 pme Exp $
+<BR> $Id: index.html,v 1.7 2000/10/21 00:51:50 jsm28 Exp $
 </EM></P>



--- a/libstdc++-v3/docs/faq/index.txt
+++ b/libstdc++-v3/docs/faq/index.txt
--- a/libstdc++-v3/docs/install.html
+++ b/libstdc++-v3/docs/install.html
@@ -9,7 +9,7 @@
   <TITLE>libstdc++-v3 Installation Instructions</TITLE>
 <LINK REL="home" HREF="http://sources.redhat.com/libstdc++/">
 <LINK REL=StyleSheet HREF="lib3styles.css">
-<!-- $Id: install.html,v 1.8 2000/08/28 18:41:24 pme Exp $ -->
+<!-- $Id: install.html,v 1.9 2000/10/21 00:51:49 jsm28 Exp $ -->
 </HEAD>
 <BODY>

@@ -41,7 +41,7 @@

 <H2><A NAME="prereqs">Tools you will need beforehand</A></H2>
   <P>You will need a recent version of g++ to compile the snapshot of
-      libstdc++:  gcc-2.95.2 works well, or one of the post-2.95.2 egcs
+      libstdc++:  gcc-2.95.2 works well, or one of the post-2.95.2 GCC
      snapshots (insert standard caveat about using snapshots rather
      than formal releases).  You will need the full source
      distribution to whatever compiler release you are using.  The
@@ -404,7 +404,7 @@
 Comments and suggestions are welcome, and may be sent to
 <A HREF="mailto:pme@sources.redhat.com">Phil Edwards</A> or
 <A HREF="mailto:gdr@gcc.gnu.org">Gabriel Dos Reis</A>.
-<BR> $Id: install.html,v 1.8 2000/08/28 18:41:24 pme Exp $
+<BR> $Id: install.html,v 1.9 2000/10/21 00:51:49 jsm28 Exp $
 </EM></P>



--- a/libstdc++-v3/docs/thanks.html
+++ b/libstdc++-v3/docs/thanks.html
@@ -34,6 +34,8 @@
      and maintaining complex&lt;&gt;, sanity checking and disbursement, 
      configuration architecture, libio maintenance, early math work.

+  <LI>David Edelsohn for doing the entire AIX port with his bare hands.
+
  <LI>Kevin Ediger for the floating point formatting of num_put::do_put.

  <LI>Phil Edwards for configuration hackery, documentation maintainer,
@@ -96,6 +98,7 @@

 <UL>

+  <LI>David Gilbert
  <LI>Levente Farkas 
  <LI>J&uuml;rgen Freyh
  <LI>James Kanze

--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -120,14 +120,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 stdio.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 iofclose.c \
+@GLIBCPP_NEED_LIBIO_TRUE@    iofopen.c stdio.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

--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -111,18 +111,31 @@ AUTOMAKE_OPTIONS = 1.3 cygnus

 noinst_LTLIBRARIES = libmath.la

-EXTRA_LONG_DOUBLE_yes =  	ccosl.c cexpl.c c_logl.c clog10l.c cpowl.c csinhl.c 	csqrtl.c ctanhl.c ctanl.c cargl.c hypotl.c 	signbitl.c cabsl.c 
+EXTRA_LONG_DOUBLE_yes = \
+	ccosl.c cexpl.c c_logl.c clog10l.c cpowl.c csinhl.c \
+	csqrtl.c ctanhl.c ctanl.c cargl.c hypotl.c \
+	signbitl.c cabsl.c 


-EXTRA_DIST =  	ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c 	cexp.c cexpf.c c_log.c c_logf.c  clog10.c clog10f.c 	cpow.c cpowf.c csin.c csinf.c csinh.c csinhf.c 	csinl.c csqrt.c csqrtf.c  ctan.c ctanf.c ctanh.c 	ctanhf.c  carg.c cargf.c hypot.c hypotf.c 	atan2f.c expf.c 	$(EXTRA_LONG_DOUBLE_yes) 
+EXTRA_DIST = \
+	ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c \
+	cexp.c cexpf.c c_log.c c_logf.c  clog10.c clog10f.c \
+	cpow.c cpowf.c csin.c csinf.c csinh.c csinhf.c \
+	csinl.c csqrt.c csqrtf.c  ctan.c ctanf.c ctanh.c \
+	ctanhf.c  carg.c cargf.c 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 $@
@@ -136,7 +149,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) 

 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h

--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -109,12 +109,12 @@ MAINT_CHARSET = latin1

 # Cross compiler and multilib support.
 # Install a library built with a cross compiler in tooldir, not libdir.
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
-@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@@gcc_version@
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)
+@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(toolexecdir)/$(gcc_version)
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@$(libdir)$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)

 # Need this library to both be part of libstdc++.a, and installed
 # separately too.
@@ -130,11 +130,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) @WFMT_FLAGS@
+WARN_CXXFLAGS = \
+	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@


 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -146,20 +148,38 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@

-INCLUDES =  	-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include 	$(CSHADOW_INCLUDES)  $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) 	$(CONFIG_INCLUDES) -I$(top_builddir)/include
+INCLUDES = \
+	-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
+	$(CSHADOW_INCLUDES)  $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
+	$(CONFIG_INCLUDES) -I$(top_builddir)/include


-headers =  	cxxabi.h exception new new.h typeinfo
+headers = \
+	cxxabi.h exception new new.h typeinfo


-sources =  	del_op.cc 	del_opnt.cc 	del_opv.cc 	del_opvnt.cc 	exception_support.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 \
+	exception_support.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)
 libsupc__convenience_la_SOURCES = $(sources)
-@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @gxx_include_dir@
-@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
-@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@
+@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @GXX_INCLUDE_DIR_TRUE@@gxx_include_dir@
+@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
+@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@$(prefix)/include/g++-@libstdcxx_interface@

 glibcppinstall_HEADERS = $(headers)

@@ -172,7 +192,12 @@ LIBSUPCXX_CXXFLAGS = -prefer-pic
 # 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
@@ -193,14 +218,16 @@ 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 have a problem when building the shared libstdc++ object if
 # the rules automake generates would be used.  We cannot allow CXX to
 # be used in libtool since this would add -lstdc++ to the link line
 # which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
+	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@

 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h

--- a/libstdc++-v3/mknumeric_limits
+++ b/libstdc++-v3/mknumeric_limits
@@ -13,7 +13,15 @@ echo "running mknumeric_limits"
 case `uname` in
    CYGWIN*) 
 	LDFLAGS='-nodefaultlibs -lcygwin -lc -lkernel32 -lgcc' ;;
-    *) 
+    AIX*) 
+	case $CXX in
+	    *pthread*)
+		LDFLAGS='-nodefaultlibs -lgcc -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a' ;;
+	    *)
+		LDFLAGS='-nodefaultlibs -lgcc -lc' ;;
+	esac
+	;;
+    *)
 	LDFLAGS='-nodefaultlibs -lgcc -lc' ;;
 esac


--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in