From 22b36782a39ec7a401151bf5990b21740de647ab Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 21 May 2010 15:07:00 +0100 Subject: acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Use GNU locale model for glibc 2.3 and later... * acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Use GNU locale model for glibc 2.3 and later, but not uClibc, without an execution test. * configure: Regenerate. * doc/xml/manual/configure.xml, doc/xml/manual/prerequisites.xml, doc/xml/faq.xml: Update. From-SVN: r159664 --- libstdc++-v3/configure | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) (limited to 'libstdc++-v3/configure') diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index df45a86..16f2185 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -15628,7 +15628,7 @@ fi /* end confdefs.h. */ #include - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) + #if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined(__UCLIBC__) _GLIBCXX_ok #endif @@ -15642,49 +15642,6 @@ fi rm -f conftest* - if test $enable_clocale = auto; then - # Test for bugs early in glibc-2.2.x series - if test "$cross_compiling" = yes; then : - enable_clocale_flag=generic -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #define _GNU_SOURCE 1 - #include - #include - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - extern __typeof(newlocale) __newlocale; - extern __typeof(duplocale) __duplocale; - extern __typeof(strcoll_l) __strcoll_l; - #endif - int main() - { - const char __one[] = "Äuglein Augmen"; - const char __two[] = "Äuglein"; - int i; - int j; - __locale_t loc; - __locale_t loc_dup; - loc = __newlocale(1 << LC_ALL, "de_DE", 0); - loc_dup = __duplocale(loc); - i = __strcoll_l(__one, __two, loc); - j = __strcoll_l(__one, __two, loc_dup); - return 0; - } - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - enable_clocale_flag=gnu -else - enable_clocale_flag=generic -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi - # Set it to scream when it hurts. ac_save_CFLAGS="$CFLAGS" CFLAGS="-Wimplicit-function-declaration -Werror" -- cgit v1.1