acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Add support for IRIX.

	* acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Add support for IRIX.
	* aclocal.m4: Regenerated.
	* Makefile.in: Regenerated.
	* libio/Makefile.in: Likewise.
	* libmath/Makefile.in: Likewise.
	* libsupc++/Makefile.in: Likewise.
	* src/Makefile.in: Likewise.
	* configure: Likewise.
	* config/os/irix/bits/ctype_base.h: Revise.
	* config/os/irix/bits/ctype_inline.h: Likewise.
	* config/os/irix/bits/ctype_noninline.h: Likewise.

From-SVN: r37215

libstdc++-v3/ChangeLog

 Thu Nov  2 10:11:45 2000  Mark P Mitchell  <mark@codesourcery.com>
 
+	* acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Add support for IRIX.
+	* aclocal.m4: Regenerated.
+	* Makefile.in: Regenerated.
+	* libio/Makefile.in: Likewise.
+	* libmath/Makefile.in: Likewise.
+	* libsupc++/Makefile.in: Likewise.
+	* src/Makefile.in: Likewise.
+	* configure: Likewise.
+	* config/os/irix/bits/ctype_base.h: Revise.
+	* config/os/irix/bits/ctype_inline.h: Likewise.
+	* config/os/irix/bits/ctype_noninline.h: Likewise.
+
+	* testsuite/22_locale/codecvt_unicode_char.cc: Don't run it
+	if not _GLIBCPP_USE_WCHAR_T.
+	* testsuite/22_locale/codecvt_unicode_wchar_t.cc: Likewise.
+	* testsuite/22_locale/ctor_copy_dtor.cc: Likewise.
+	* testsuite/22_locale/ctype_wchar_t_members.cc: Likewise.
+	
+	* mkcheck.in: Fix echoing of -rpath option.
+	
 	* config/os/irix/bits/atomicity.h (_Atomic_word): Make it a
 	signed type.
 	(__exchange_aand_add): Adjust accordingly.

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
@@ -146,7 +187,7 @@ mkcheck.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -310,7 +351,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

libstdc++-v3/acinclude.m4

@@ -953,6 +953,22 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
     fi
     fi
 
+    dnl Test for <ctype> functionality -- IRIX
+    if test $ctype_defualt ="yes"; then 
+    AC_MSG_CHECKING([<ctype> for IRIX])
+    AC_TRY_COMPILE([#include <ctype.h>],
+    [int
+    foo (int a)
+    { return _U + _L + _N + _S + _P + _C + _B + _X + \
+             _A + _PR + _G + _BL;}], \
+    ctype_irix=yes, ctype_irix=no)
+    AC_MSG_RESULT($ctype_irix)
+    if test $ctype_irix = "yes"; then
+      ctype_include_dir="config/os/irix"
+      ctype_default=no
+    fi
+    fi
+
     dnl Test for <ctype> functionality -- newlib
     if test $ctype_default = "yes"; then
     AC_MSG_CHECKING([<ctype> for newlib])

libstdc++-v3/aclocal.m4

@@ -965,6 +965,22 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
     fi
     fi
 
+    dnl Test for <ctype> functionality -- IRIX
+    if test $ctype_defualt ="yes"; then 
+    AC_MSG_CHECKING([<ctype> for IRIX])
+    AC_TRY_COMPILE([#include <ctype.h>],
+    [int
+    foo (int a)
+    { return _U + _L + _N + _S + _P + _C + _B + _X + \
+             _A + _PR + _G + _BL;}], \
+    ctype_irix=yes, ctype_irix=no)
+    AC_MSG_RESULT($ctype_irix)
+    if test $ctype_irix = "yes"; then
+      ctype_include_dir="config/os/irix"
+      ctype_default=no
+    fi
+    fi
+
     dnl Test for <ctype> functionality -- newlib
     if test $ctype_default = "yes"; then
     AC_MSG_CHECKING([<ctype> for newlib])
@@ -1338,14 +1354,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
          fi
       fi
       ;;
-
-    xwince)
-      CSTDIO_H=config/c_io_wince.h
-      CSTDIO_CC=config/c_io_wince.cc
-      AC_MSG_RESULT(wince)
-
-      need_libio=no
-      ;;
     xstdio)
       CSTDIO_H=config/c_io_stdio.h
       CSTDIO_CC=config/c_io_stdio.cc

libstdc++-v3/config/os/irix/bits/ctype_base.h

@@ -35,7 +35,7 @@
   
   struct ctype_base
   {
-    typedef unsigned char 	mask;
+    typedef unsigned int 	mask;
     // Non-standard typedefs.
     typedef int* 		__to_type;
 

libstdc++-v3/config/os/irix/bits/ctype_inline.h

 // Locale support -*- C++ -*-
 
-// Copyright (C) 2000 Cygnus Solutions
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -37,14 +37,14 @@
   bool
   ctype<char>::
   is(mask __m, char __c) const throw()
-  { return (_M_table + 1)[(unsigned char)(__c)] & __m; }
+  { return (_M_table)[(unsigned char)(__c)] & __m; }
 
   const char*
   ctype<char>::
   is(const char* __low, const char* __high, mask* __vec) const throw()
   {
     while (__low < __high)
-      *__vec++ = (_M_table + 1)[(unsigned char)(*__low++)];
+      *__vec++ = (_M_table)[(unsigned char)(*__low++)];
     return __high;
   }
 
@@ -52,7 +52,7 @@
   ctype<char>::
   scan_is(mask __m, const char* __low, const char* __high) const throw()
   {
-    while (__low < __high && !((_M_table + 1)[(unsigned char)(*__low)] & __m))
+    while (__low < __high && !((_M_table)[(unsigned char)(*__low)] & __m))
       ++__low;
     return __low;
   }

libstdc++-v3/config/os/irix/bits/ctype_noninline.h

@@ -32,14 +32,45 @@
 //
   
 // Information as gleaned from /usr/include/ctype.h
-  
-  ctype_base::__to_type const& ctype<char>::_S_toupper = _toupper;
-  ctype_base::__to_type const& ctype<char>::_S_tolower = _tolower;
-  const ctype_base::mask* const& ctype<char>::_S_table = __ctype;
-
-#ifdef _GLIBCPP_USE_WCHAR_T  
-  ctype_base::__to_type const& ctype<wchar_t>::_S_toupper = _toupper;
-  ctype_base::__to_type const& ctype<wchar_t>::_S_tolower = _tolower;
-  const ctype_base::mask* const& ctype<wchar_t>::_S_table = __ctype;
-#endif
+
+  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
+	size_t __refs = 0)
+    : _Ctype_nois<char>(__refs), _M_del(__table != 0 && __del), 
+      _M_toupper(NULL),
+      _M_tolower(NULL),
+      _M_ctable(NULL), 
+      _M_table(!__table
+	       ? (const mask*) (__libc_attr._ctype_tbl->_class + 1)
+	       : __table) 
+    { }
+
+  char
+  ctype<char>::do_toupper(char __c) const
+  { return _toupper(__c); }
+
+  const char*
+  ctype<char>::do_toupper(char* __low, const char* __high) const
+  {
+    while (__low < __high)
+      {
+	*__low = do_toupper(*__low);
+	++__low;
+      }
+    return __high;
+  }
+
+  char
+  ctype<char>::do_tolower(char __c) const
+  { return _tolower(__c); }
+
+  const char* 
+  ctype<char>::do_tolower(char* __low, const char* __high) const
+  {
+    while (__low < __high)
+      {
+	*__low = do_tolower(*__low);
+	++__low;
+      }
+    return __high;
+  }
 

libstdc++-v3/libio/Makefile.in

@@ -120,15 +120,24 @@ 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_FALSE@LIBIO_SRCS = 
-@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = 	wfiledoalloc.c wfileops.c wgenops.c iofwide.c
-@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = 
+@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 = \
+@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
 
@@ -182,7 +191,7 @@ DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libio_la_SOURCES)
 OBJECTS = $(libio_la_OBJECTS)
@@ -291,7 +300,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

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
@@ -159,7 +174,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libmath_la_SOURCES)
 OBJECTS = $(libmath_la_OBJECTS)
@@ -268,7 +283,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

libstdc++-v3/libsupc++/Makefile.in

@@ -109,12 +109,18 @@ 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 +136,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 +154,41 @@ 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 +201,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 +227,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
@@ -232,7 +268,7 @@ DIST_COMMON =  Makefile.am Makefile.in configure configure.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)
@@ -390,7 +426,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \