diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 27 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 27 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 27 |
4 files changed, 54 insertions, 36 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f046caa..0349517 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2003-09-10 Daniel Jacobowitz <drow@mvista.com> + Andreas Jaeger <aj@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@codesourcery.com> * libsupc++/vec.cc (__cxa_vec_new2): If the allocator returns diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 0ba24ba..177a4d4 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -585,24 +585,27 @@ AC_DEFUN(GLIBCXX_CONFIGURE_TESTSUITE, [ # 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) ]) diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 4239908..f37b565 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -598,24 +598,27 @@ AC_DEFUN(GLIBCXX_CONFIGURE_TESTSUITE, [ # 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) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index fb170a7..2a41645 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -59011,24 +59011,27 @@ done 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 - |