[llvm-commits] CVS: gcc-3.4/libstdc++-v3/ChangeLog Makefile.in acinclude.m4 aclocal.m4 configure configure.ac

John Criswell criswell at cs.uiuc.edu
Thu Feb 5 10:09:18 PST 2004


Changes in directory gcc-3.4/libstdc++-v3:

ChangeLog updated: 1.2 -> 1.3
Makefile.in updated: 1.2 -> 1.3
acinclude.m4 updated: 1.2 -> 1.3
aclocal.m4 updated: 1.2 -> 1.3
configure updated: 1.2 -> 1.3
configure.ac updated: 1.2 -> 1.3

---
Log message:

Commit of merge from September 24, 2003 of mainline GCC.  This merge now
works reasonably on Linux/x86 and probably works on Solaris/Sparc.



---
Diffs of the changes:  (+358 -61)

Index: gcc-3.4/libstdc++-v3/ChangeLog
diff -u gcc-3.4/libstdc++-v3/ChangeLog:1.2 gcc-3.4/libstdc++-v3/ChangeLog:1.3
--- gcc-3.4/libstdc++-v3/ChangeLog:1.2	Fri Jan  9 10:54:34 2004
+++ gcc-3.4/libstdc++-v3/ChangeLog	Thu Feb  5 10:05:48 2004
@@ -1,3 +1,172 @@
+2003-09-23  Benjamin Kosnik  <bkoz at redhat.com>
+
+	* include/bits/locale_facets.tcc: Tweak to avoid warnings.
+	* testsuite/testsuite_hooks.h: Same.
+	* testsuite/*/*.cc: Same.
+
+2003-09-22  Petur Runolfsson  <peturr02 at ru.is>
+
+	* include/bits/istream.tcc (basic_istream::read,
+	basic_istream::readsome, basic_istream::putback,
+	basic_istream::unget, operator>>(basic_istream, CharT)):
+	Avoid redundant setstate(failbit) calls when sentry::operator bool()
+	returns false.
+
+2003-09-22  Carlo Wood  <carlo at alinoe.com>
+
+	PR libstdc++/12365
+	* include/bits/demangle.h (qualifier(int, cv_qualifier_nt,
+	char const*, int, int)):  Remove unused identifier
+	cv_qualifier for overloaded constructor.
+
+2003-09-18  Benjamin Kosnik  <bkoz at redhat.com>
+
+	PR libstdc++/11504
+	* acinclude.m4 (GLIBCXX_EXPORT_FLAGS): Add -Wcast-qual to
+	WARN_FLAGS, remove -Wno-format.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2003-09-18  Petur Runolfsson  <peturr02 at ru.is>
+
+	* config/io/basic_file_stdio.cc (sys_getc, sys_ungetc): Delete.
+	* config/io/basic_file_stdio.h: Same.
+	* include/std/std_fstream.h (__ctype_type): Delete.
+	* include/std/std_streambuf.h (__ctype_type, __state_type): Delete.
+	
+2003-09-17  Benjamin Kosnik  <bkoz at redhat.com>
+
+	PR libstdc++/12239
+	* configure.host (abi_baseline_pair): Error out on solaris2
+	configurations without a minor version number.
+
+2003-09-13  Phil Edwards  <phil at codesourcery.com>
+
+	* docs/doxygen/run_doxygen:  Clear GENERATE_TAGFILE entirely
+	if man pages are on.
+	* docs/doxygen/user.cfg.in:  And here.
+
+2003-09-10  Daniel Jacobowitz  <drow at mvista.com>
+	    Andreas Jaeger <aj at suse.de>
+
+	PR libstdc++/12189
+	* acinclude.m4 (GLIBCXX_CONFIGURE_TESTSUITE): Don't build
+	abi_check if cross compiling.
+	* aclocal.m4: Regenerated.
+	* configure: Regenerated.
+
+2003-09-10  Jeffrey D. Oldham  <oldham at codesourcery.com>
+
+	* libsupc++/vec.cc (__cxa_vec_new2): If the allocator returns
+	NULL, return NULL.  This reflects a C++ ABI change 2003 Sep 05.
+	(__cxa_vec_new3): Likewise.
+
+2003-09-10  Petur Runolfsson  <peturr02 at ru.is>
+
+	* include/bits/fstream.tcc (basic_filebuf::seekoff):
+	Use codecvt::length to handle variable-width stateless encodings
+	correctly.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc: New test.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc: New test.
+
+2003-09-10  Alan Modra  <amodra at bigpond.net.au>
+
+	* config/io/basic_file_stdio.cc (_M_open_mode): Assign __p_mode
+	rather than or'ing.
+
+2003-09-09  Alan Modra  <amodra at bigpond.net.au>
+
+	* configure: Regenerate.
+
+2003-09-09  David Edelsohn  <edelsohn at gnu.org>
+
+	* src/ios.cc (ios_base::Init::Init): Remove unnecessary
+	qualifier from _S_synced_with_stdio.
+
+2003-09-09  Bernardo Innocenti  <bernie at develer.com>
+
+	* include/c_std/std_cstdlib.h: Avoid using missing C library symbols.
+
+2003-09-04  Petur Runolfsson  <peturr02 at ru.is>
+
+	PR libstdc++/9028
+	* include/bits/fstream.tcc
+	(basic_filebuf::_M_destroy_internal_buffer): Destroy _M_ext_buf.
+	(basic_filebuf::basic_filebuf): Initialize _M_ext_buf,
+	_M_ext_buf_size, _M_ext_next and _M_ext_end.
+	(basic_filebuf::underflow): Handle variable-width stateless
+	encodings (codecvt::encoding() == 0), including UTF-8.
+	* include/std/std_fstream.h (basic_filebuf):
+	Declare _M_ext_buf, _M_ext_buf_size, _M_ext_next, _M_ext_end.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc: New test.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc: New test.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc: New test.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc: New test.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc: New test.
+	* testsuite/27_io/objects/wchar_t/12.cc: New test.
+	* testsuite/27_io/objects/wchar_t/13.cc: New test.
+
+2003-09-04  Jonathan Wakely  <redi at gcc.gnu.org>
+
+	* docs/html/faq/index.html: Note that a namespace alias can't be
+	used when specialising templates in extension namespace.
+	* docs/html/faq/index.txt: Regenerate.
+
+2003-09-03  Petur Runolfsson  <peturr02 at ru.is>
+
+	PR libstdc++/12048
+	* include/ext/stdio_sync_filebuf.h
+	(stdio_sync_filebuf::_M_unget_buf): Declare it.
+	(stdio_sync_filebuf::stdio_sync_filebuf): Initialize _M_unget_buf.
+	(stdio_sync_filebuf::uflow): Store the returned character in
+	_M_unget_buf.
+	(stdio_sync_filebuf::pbackfail): If argument is eof(), pass
+	_M_unget_buf to syncungetc(). Set _M_unget_buf to eof().
+	(stdio_sync_filebuf<char>::xsgetn): Store last read character in
+	_M_unget_buf, if any, else eof().
+	(stdio_sync_filebuf<wchar_t>::xsgetn: Store last read character in
+	_M_unget_buf, if any, else eof().
+	* testsuite/27_io/objects/char/12048.cc: Rename to...
+	* testsuite/27_io/objects/char/12048-1.cc: ...this.
+	* testsuite/27_io/objects/char/12048-2.cc: New test.
+	* testsuite/27_io/objects/char/12048-3.cc: New test.
+	* testsuite/27_io/objects/char/12048-4.cc: New test.
+	* testsuite/27_io/objects/char/12048-5.cc: New test. XFAIL.
+	* testsuite/27_io/objects/wchar_t/12048-1.cc: New test.
+	* testsuite/27_io/objects/wchar_t/12048-2.cc: New test.
+	* testsuite/27_io/objects/wchar_t/12048-3.cc: New test.
+	* testsuite/27_io/objects/wchar_t/12048-4.cc: New test.
+	* testsuite/27_io/objects/wchar_t/12048-5.cc: New test. XFAIL.
+	* testsuite/ext/stdio_sync_filebuf_char.cc
+	(test02, test03, test04, test05): New tests.
+	* testsuite/ext/stdio_sync_filebuf_wchar_t.cc
+	(test02, test03, test04, test05): New tests.
+
+2003-09-03  Petur Runolfsson  <peturr02 at ru.is>
+
+	* docs/html/27_io/howto.html: setbuf(0, 0) has no effect on
+	stringbuf or strstreambuf. Fix typos.
+
+2003-09-02  Phil Edwards  <phil at codesourcery.com>
+
+	* acinclude.m4 (GLIBCXX_ENABLE_HOSTED):  #define _GLIBCXX_HOSTED
+	appropriately.
+	* config.h.in:  Add _GLIBCXX_HOSTED.
+	* libsupc++/eh_term_handler.cc:  Test it here; initialize
+	__terminate_handler to std::abort if freestanding.
+	* aclocal.m4, configure:  Regenerated.
+	* docs/html/configopts.html:  Document --disable-hosted-libstdcxx.
+
+2003-08-29  Nathan Myers  <ncm at cantrip.org>
+	
+	PR libstdc++/11990	
+	* include/bits/locale_facets.tcc (__pad): delete dead code.
+
+2003-08-28  Alan Modra  <amodra at bigpond.net.au>
+
+	* configure.ac: Test $with_cross_host against $build_alias, not $build.
+	* configure: Regenerate.
+
 2003-08-27  Petur Runolfsson  <peturr02 at ru.is>
 
 	* testsuite/27_io/objects/wchar_t/10.cc: Move wcout stuff...


Index: gcc-3.4/libstdc++-v3/Makefile.in
diff -u gcc-3.4/libstdc++-v3/Makefile.in:1.2 gcc-3.4/libstdc++-v3/Makefile.in:1.3
--- gcc-3.4/libstdc++-v3/Makefile.in:1.2	Fri Jan  9 10:54:34 2004
+++ gcc-3.4/libstdc++-v3/Makefile.in	Thu Feb  5 10:05:48 2004
@@ -219,7 +219,7 @@
 # -I/-D flags to pass when compiling.
 AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
 @GLIBCXX_HOSTED_TRUE at hosted_source = src po
-SUBDIRS = include libmath libsupc++ $(hosted_source) testsuite 
+SUBDIRS = include libmath libsupc++ $(hosted_source) testsuite
 
 # Multilib support.
 MAKEOVERRIDES = 
@@ -273,7 +273,7 @@
 	"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
 	"DESTDIR=$(DESTDIR)" \
-	"WERROR=$(WERROR)" 
+	"WERROR=$(WERROR)"
 
 
 # Subdir rules rely on $(FLAGS_TO_PASS)


Index: gcc-3.4/libstdc++-v3/acinclude.m4
diff -u gcc-3.4/libstdc++-v3/acinclude.m4:1.2 gcc-3.4/libstdc++-v3/acinclude.m4:1.3
--- gcc-3.4/libstdc++-v3/acinclude.m4:1.2	Fri Jan  9 10:54:34 2004
+++ gcc-3.4/libstdc++-v3/acinclude.m4	Thu Feb  5 10:05:48 2004
@@ -585,24 +585,27 @@
 
     # Look for setenv, so that extended locale tests can be performed.
     GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
+
+    if test $enable_symvers = no; then
+      enable_abi_check=no
+    else
+      case "$host" in
+        *-*-cygwin*)
+          enable_abi_check=no ;;
+        *)
+          enable_abi_check=yes ;;
+      esac
+    fi
+  else
+    # Only build this as native, since automake does not understand
+    # CXX_FOR_BUILD.
+    enable_abi_check=no
   fi
 
   # Export file names for ABI checking.
   baseline_dir="$glibcxx_srcdir/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
   AC_SUBST(baseline_dir)
 
-  # Determine if checking the ABI is desirable.
-  if test $enable_symvers = no || test $is_hosted = no; then
-    enable_abi_check=no
-  else
-    case "$host" in
-      *-*-cygwin*)
-        enable_abi_check=no ;;
-      *)
-        enable_abi_check=yes ;;
-    esac
-  fi
-
   GLIBCXX_CONDITIONAL(GLIBCXX_TEST_WCHAR_T, test $enable_wchar_t = yes)
   GLIBCXX_CONDITIONAL(GLIBCXX_TEST_ABI, test $enable_abi_check = yes)
 ])
@@ -653,7 +656,7 @@
   OPTIMIZE_CXXFLAGS=
   AC_SUBST(OPTIMIZE_CXXFLAGS)
 
-  WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings'
+  WARN_FLAGS='-Wall -W -Wwrite-strings -Wcast-qual'
   AC_SUBST(WARN_FLAGS)
 ])
 
@@ -1276,6 +1279,9 @@
 dnl Sets:
 dnl  is_hosted  (yes/no)
 dnl
+dnl Defines:
+dnl  _GLIBCXX_HOSTED   (always defined, either to 1 or 0)
+dnl
 AC_DEFUN(GLIBCXX_ENABLE_HOSTED, [
   AC_ARG_ENABLE([hosted-libstdcxx],
     AC_HELP_STRING([--disable-hosted-libstdcxx],
@@ -1284,12 +1290,16 @@
   if test "$enable_hosted_libstdcxx" = no; then
     AC_MSG_NOTICE([Only freestanding libraries will be built])
     is_hosted=no
+    hosted_define=0
     enable_abi_check=no
     enable_libstdcxx_pch=no
   else
     is_hosted=yes
+    hosted_define=1
   fi
   GLIBCXX_CONDITIONAL(GLIBCXX_HOSTED, test $is_hosted = yes)
+  AC_DEFINE_UNQUOTED(_GLIBCXX_HOSTED, $hosted_define,
+    [Define to 1 if a full hosted library is built, or 0 if freestanding.])
 ])
 
 


Index: gcc-3.4/libstdc++-v3/aclocal.m4
diff -u gcc-3.4/libstdc++-v3/aclocal.m4:1.2 gcc-3.4/libstdc++-v3/aclocal.m4:1.3
--- gcc-3.4/libstdc++-v3/aclocal.m4:1.2	Fri Jan  9 10:54:34 2004
+++ gcc-3.4/libstdc++-v3/aclocal.m4	Thu Feb  5 10:05:48 2004
@@ -598,24 +598,27 @@
 
     # Look for setenv, so that extended locale tests can be performed.
     GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
+
+    if test $enable_symvers = no; then
+      enable_abi_check=no
+    else
+      case "$host" in
+        *-*-cygwin*)
+          enable_abi_check=no ;;
+        *)
+          enable_abi_check=yes ;;
+      esac
+    fi
+  else
+    # Only build this as native, since automake does not understand
+    # CXX_FOR_BUILD.
+    enable_abi_check=no
   fi
 
   # Export file names for ABI checking.
   baseline_dir="$glibcxx_srcdir/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
   AC_SUBST(baseline_dir)
 
-  # Determine if checking the ABI is desirable.
-  if test $enable_symvers = no || test $is_hosted = no; then
-    enable_abi_check=no
-  else
-    case "$host" in
-      *-*-cygwin*)
-        enable_abi_check=no ;;
-      *)
-        enable_abi_check=yes ;;
-    esac
-  fi
-
   GLIBCXX_CONDITIONAL(GLIBCXX_TEST_WCHAR_T, test $enable_wchar_t = yes)
   GLIBCXX_CONDITIONAL(GLIBCXX_TEST_ABI, test $enable_abi_check = yes)
 ])
@@ -666,7 +669,7 @@
   OPTIMIZE_CXXFLAGS=
   AC_SUBST(OPTIMIZE_CXXFLAGS)
 
-  WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings'
+  WARN_FLAGS='-Wall -W -Wwrite-strings -Wcast-qual'
   AC_SUBST(WARN_FLAGS)
 ])
 
@@ -1289,6 +1292,9 @@
 dnl Sets:
 dnl  is_hosted  (yes/no)
 dnl
+dnl Defines:
+dnl  _GLIBCXX_HOSTED   (always defined, either to 1 or 0)
+dnl
 AC_DEFUN(GLIBCXX_ENABLE_HOSTED, [
   AC_ARG_ENABLE([hosted-libstdcxx],
     AC_HELP_STRING([--disable-hosted-libstdcxx],
@@ -1297,12 +1303,16 @@
   if test "$enable_hosted_libstdcxx" = no; then
     AC_MSG_NOTICE([Only freestanding libraries will be built])
     is_hosted=no
+    hosted_define=0
     enable_abi_check=no
     enable_libstdcxx_pch=no
   else
     is_hosted=yes
+    hosted_define=1
   fi
   GLIBCXX_CONDITIONAL(GLIBCXX_HOSTED, test $is_hosted = yes)
+  AC_DEFINE_UNQUOTED(_GLIBCXX_HOSTED, $hosted_define,
+    [Define to 1 if a full hosted library is built, or 0 if freestanding.])
 ])
 
 


Index: gcc-3.4/libstdc++-v3/configure
diff -u gcc-3.4/libstdc++-v3/configure:1.2 gcc-3.4/libstdc++-v3/configure:1.3
--- gcc-3.4/libstdc++-v3/configure:1.2	Fri Jan  9 10:54:34 2004
+++ gcc-3.4/libstdc++-v3/configure	Thu Feb  5 10:05:48 2004
@@ -971,7 +971,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -1170,7 +1170,7 @@
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
+  rm -f core core.* *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -2800,7 +2800,8 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   '' \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2814,8 +2815,8 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -3125,7 +3126,8 @@
   fi
 fi
 for ac_declaration in \
-   '' \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -3139,8 +3141,8 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -4265,7 +4267,7 @@
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4268 "configure"' > conftest.$ac_ext
+  echo '#line 4270 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4334,7 +4336,7 @@
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -4819,13 +4821,20 @@
     { echo "$as_me:$LINENO: Only freestanding libraries will be built" >&5
 echo "$as_me: Only freestanding libraries will be built" >&6;}
     is_hosted=no
+    hosted_define=0
     enable_abi_check=no
     enable_libstdcxx_pch=no
   else
     is_hosted=yes
+    hosted_define=1
   fi
 
 
+cat >>confdefs.h <<_ACEOF
+#define _GLIBCXX_HOSTED $hosted_define
+_ACEOF
+
+
 
 # Check for support bits and g++ features that don't require linking.
 
@@ -4862,7 +4871,7 @@
     #
     # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
     cat > conftest.$ac_ext << EOF
-#line 4865 "configure"
+#line 4874 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
@@ -5453,7 +5462,7 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -5644,7 +5653,7 @@
 ( exit $ac_status )
 enable_clocale_flag=generic
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
           fi
 
@@ -7800,7 +7809,7 @@
 ( exit $ac_status )
 ac_sectionLDflags=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS="$ac_save_CFLAGS"
@@ -27274,7 +27283,7 @@
 ( exit $ac_status )
 ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
@@ -27309,7 +27318,7 @@
   # If Canadian cross, then don't pick up tools from the build directory.
   # Used only in GLIBCXX_EXPORT_INCLUDES.
   if test -n "$with_cross_host" &&
-     test x"$build" != x"$with_cross_host" &&
+     test x"$build_alias" != x"$with_cross_host" &&
      test x"$build" != x"$target";
   then
     CANADIAN=yes
@@ -46814,7 +46823,7 @@
 ( exit $ac_status )
 ac_sectionLDflags=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS="$ac_save_CFLAGS"
@@ -48864,7 +48873,7 @@
 ( exit $ac_status )
 ac_sectionLDflags=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS="$ac_save_CFLAGS"
@@ -50783,7 +50792,7 @@
 ( exit $ac_status )
 ac_sectionLDflags=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS="$ac_save_CFLAGS"
@@ -52711,7 +52720,7 @@
 ( exit $ac_status )
 ac_sectionLDflags=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS="$ac_save_CFLAGS"
@@ -54586,7 +54595,7 @@
 ( exit $ac_status )
 ac_sectionLDflags=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS="$ac_save_CFLAGS"
@@ -56360,7 +56369,7 @@
 ( exit $ac_status )
 ac_sectionLDflags=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS="$ac_save_CFLAGS"
@@ -59005,23 +59014,122 @@
 
   fi
 
+
+    if test $enable_symvers = no; then
+      enable_abi_check=no
+    else
+      case "$host" in
+        *-*-cygwin*)
+          enable_abi_check=no ;;
+        *)
+          enable_abi_check=yes ;;
+      esac
+    fi
+  else
+    # Only build this as native, since automake does not understand
+    # CXX_FOR_BUILD.
+    enable_abi_check=no
   fi
 
   # Export file names for ABI checking.
   baseline_dir="$glibcxx_srcdir/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
 
 
-  # Determine if checking the ABI is desirable.
-  if test $enable_symvers = no || test $is_hosted = no; then
-    enable_abi_check=no
-  else
-    case "$host" in
-      *-*-cygwin*)
-        enable_abi_check=no ;;
-      *)
-        enable_abi_check=yes ;;
-    esac
-  fi
+
+
+
+
+# Propagate the target-specific source directories through the build chain.
+# (Nothing currently uses cpu_include_dir directly; only atomicity_include_dir
+# uses it, and it only gets used in this file.)
+ATOMICITY_INC_SRCDIR=config/${atomicity_include_dir}
+OS_INC_SRCDIR=config/${os_include_dir}
+FPOS_INC_SRCDIR=config/${fpos_include_dir}
+
+
+
+
+# Determine cross-compile flags and AM_CONDITIONALs.
+#AC_SUBST(GLIBCXX_IS_NATIVE)
+#AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes)
+# from GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT:
+#AM_CONDITIONAL(GLIBCXX_BUILD_LIBMATH,  test $need_libmath = yes)
+
+
+if test $is_hosted = yes; then
+  GLIBCXX_HOSTED_TRUE=
+  GLIBCXX_HOSTED_FALSE='#'
+else
+  GLIBCXX_HOSTED_TRUE='#'
+  GLIBCXX_HOSTED_FALSE=
+fi
+
+
+
+
+if test $enable_libstdcxx_pch = yes; then
+  GLIBCXX_BUILD_PCH_TRUE=
+  GLIBCXX_BUILD_PCH_FALSE='#'
+else
+  GLIBCXX_BUILD_PCH_TRUE='#'
+  GLIBCXX_BUILD_PCH_FALSE=
+fi
+
+
+
+
+if test $enable_cheaders = c; then
+  GLIBCXX_C_HEADERS_C_TRUE=
+  GLIBCXX_C_HEADERS_C_FALSE='#'
+else
+  GLIBCXX_C_HEADERS_C_TRUE='#'
+  GLIBCXX_C_HEADERS_C_FALSE=
+fi
+
+
+
+
+if test $enable_cheaders = c_std; then
+  GLIBCXX_C_HEADERS_C_STD_TRUE=
+  GLIBCXX_C_HEADERS_C_STD_FALSE='#'
+else
+  GLIBCXX_C_HEADERS_C_STD_TRUE='#'
+  GLIBCXX_C_HEADERS_C_STD_FALSE=
+fi
+
+
+
+
+if test $c_compatibility = yes; then
+  GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE=
+  GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE='#'
+else
+  GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE='#'
+  GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE=
+fi
+
+
+
+
+if test $enable_libstdcxx_debug = yes; then
+  GLIBCXX_BUILD_DEBUG_TRUE=
+  GLIBCXX_BUILD_DEBUG_FALSE='#'
+else
+  GLIBCXX_BUILD_DEBUG_TRUE='#'
+  GLIBCXX_BUILD_DEBUG_FALSE=
+fi
+
+
+
+
+if test $enable_symvers != no; then
+  GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE=
+  GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE='#'
+else
+  GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE='#'
+  GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE=
+fi
+
 
 
 
@@ -59322,7 +59430,7 @@
   OPTIMIZE_CXXFLAGS=
 
 
-  WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings'
+  WARN_FLAGS='-Wall -W -Wwrite-strings -Wcast-qual'
 
 
 


Index: gcc-3.4/libstdc++-v3/configure.ac
diff -u gcc-3.4/libstdc++-v3/configure.ac:1.2 gcc-3.4/libstdc++-v3/configure.ac:1.3
--- gcc-3.4/libstdc++-v3/configure.ac:1.2	Fri Jan  9 10:54:34 2004
+++ gcc-3.4/libstdc++-v3/configure.ac	Thu Feb  5 10:05:49 2004
@@ -165,7 +165,7 @@
   # If Canadian cross, then don't pick up tools from the build directory.
   # Used only in GLIBCXX_EXPORT_INCLUDES.
   if test -n "$with_cross_host" &&
-     test x"$build" != x"$with_cross_host" &&
+     test x"$build_alias" != x"$with_cross_host" &&
      test x"$build" != x"$target";
   then
     CANADIAN=yes





More information about the llvm-commits mailing list