diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 16 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 114 |
3 files changed, 7 insertions, 130 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0cbbb32..dc4545b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-06-26 Paolo Carlini <pcarlini@suse.de> + + PR libstdc++/16210 + * acinclude.m4 (GLIBCXX_ENABLE_LONG_LONG): Do not check for the + availability of strto(u)ll, not used anymore in the iostreams. + * configure: Regenerate. + 2004-06-25 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/16182 diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 6c60934..64b208f 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1402,28 +1402,12 @@ dnl --enable-long-long defines _GLIBCXX_USE_LONG_LONG dnl --disable-long-long leaves _GLIBCXX_USE_LONG_LONG undefined dnl + Usage: GLIBCXX_ENABLE_LONG_LONG[(DEFAULT)] dnl Where DEFAULT is either `yes' or `no'. -dnl + If 'long long' stuff is not available, ignores DEFAULT and sets `no'. dnl AC_DEFUN([GLIBCXX_ENABLE_LONG_LONG], [ GLIBCXX_ENABLE(long-long,$1,,[enables I/O support for 'long long']) - - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - AC_MSG_CHECKING([for enabled long long I/O support]) - # iostreams require strtoll, strtoull to compile - AC_TRY_COMPILE([#include <stdlib.h>], - [char* tmp; strtoll("gnu", &tmp, 10);],,[enable_long_long=no]) - AC_TRY_COMPILE([#include <stdlib.h>], - [char* tmp; strtoull("gnu", &tmp, 10);],,[enable_long_long=no]) - - # Option parsed, now set things appropriately if test $enable_long_long = yes; then AC_DEFINE(_GLIBCXX_USE_LONG_LONG) fi - AC_MSG_RESULT($enable_long_long) - - AC_LANG_RESTORE ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index f749f5f..5ab13a4 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -7685,126 +7685,12 @@ else enable_long_long=yes fi; - - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - echo "$as_me:$LINENO: checking for enabled long long I/O support" >&5 -echo $ECHO_N "checking for enabled long long I/O support... $ECHO_C" >&6 - # iostreams require strtoll, strtoull to compile - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdlib.h> -int -main () -{ -char* tmp; strtoll("gnu", &tmp, 10); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -enable_long_long=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdlib.h> -int -main () -{ -char* tmp; strtoull("gnu", &tmp, 10); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -enable_long_long=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - # Option parsed, now set things appropriately if test $enable_long_long = yes; then cat >>confdefs.h <<\_ACEOF #define _GLIBCXX_USE_LONG_LONG 1 _ACEOF fi - echo "$as_me:$LINENO: result: $enable_long_long" >&5 -echo "${ECHO_T}$enable_long_long" >&6 - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:$LINENO: checking for thread model used by GCC" >&5 |