From c470c17d65e668b46c5679b5eacffc4d35abeb35 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik <bkoz@purist.soma.redhat.com> Date: Mon, 19 Jun 2000 03:14:40 +0000 Subject: [PATCH] Makefile.am (string_sources): Simplify... 2000-06-14 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * src/Makefile.am (string_sources): Simplify, assuming that with -ffunction-sections, -fdata-sections, -Wl,--gc-sections, all this hacking is not necessary. (wstring_sources): Same. (OPTIMIZE_CXXFLAGS): Enable -fdata-sections -ffunction-sections -Wl,--gc-sections. * src/string-inst.cc: Remove macro blocks. * mkcheck.in (CXX_FLAG): Add bits here. * src/string-inst.cc: Remove iostream-related string instantiations. * src/misc-inst.cc: Add here. * acinclude.m4 (GLIBCPP_CHECK_COMPILER_VERSION): Change FMTFLAGS to WFMT_FLAGS. * aclocal.m4: Regenerate. * configure.in: Change up. * configure: Regenerate. From-SVN: r34593 --- libstdc++-v3/ChangeLog | 20 + libstdc++-v3/Makefile.in | 8 +- libstdc++-v3/acinclude.m4 | 109 ++- libstdc++-v3/aclocal.m4 | 109 ++- libstdc++-v3/configure | 1101 ++++++++++++++++--------------- libstdc++-v3/configure.in | 2 + libstdc++-v3/libio/Makefile.in | 8 +- libstdc++-v3/math/Makefile.in | 8 +- libstdc++-v3/mkcheck.in | 2 +- libstdc++-v3/src/Makefile.am | 304 +-------- libstdc++-v3/src/Makefile.in | 358 +--------- libstdc++-v3/src/misc-inst.cc | 32 +- libstdc++-v3/src/string-inst.cc | 129 +--- 13 files changed, 870 insertions(+), 1320 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 47b8f8ef583d..a6bb64926e06 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,23 @@ +2000-06-14 Benjamin Kosnik <bkoz@purist.soma.redhat.com> + + * src/Makefile.am (string_sources): Simplify, assuming that with + -ffunction-sections, -fdata-sections, -Wl,--gc-sections, all this + hacking is not necessary. + (wstring_sources): Same. + (OPTIMIZE_CXXFLAGS): Enable -fdata-sections -ffunction-sections + -Wl,--gc-sections. + * src/string-inst.cc: Remove macro blocks. + * mkcheck.in (CXX_FLAG): Add bits here. + + * src/string-inst.cc: Remove iostream-related string instantiations. + * src/misc-inst.cc: Add here. + + * acinclude.m4 (GLIBCPP_CHECK_COMPILER_VERSION): Change FMTFLAGS + to WFMT_FLAGS. + * aclocal.m4: Regenerate. + * configure.in: Change up. + * configure: Regenerate. + 2000-06-13 Steven King <sxking@uswest.net> * acinclude.m4: Fixup some of the builtin math tests and add tests for diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 79b81bf24fb9..2d9a1596414f 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -68,18 +68,17 @@ AS = @AS@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ CC = @CC@ CPP = @CPP@ -CPUFLAGS = @CPUFLAGS@ +CPU_FLAGS = @CPU_FLAGS@ CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSTDIO_CC = @CSTDIO_CC@ CSTDIO_H = @CSTDIO_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ -DEBUGFLAGS = @DEBUGFLAGS@ +DEBUG_FLAGS = @DEBUG_FLAGS@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@ -FMTFLAGS = @FMTFLAGS@ GCC_OBJDIR = @GCC_OBJDIR@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ @@ -92,6 +91,8 @@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SECTION_FLAGS = @SECTION_FLAGS@ +SECTION_LDFLAGS = @SECTION_LDFLAGS@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ @@ -100,6 +101,7 @@ THREADSPEC = @THREADSPEC@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ VERSION = @VERSION@ WERROR = @WERROR@ +WFMT_FLAGS = @WFMT_FLAGS@ cpu_include_dir = @cpu_include_dir@ ctype_include_dir = @ctype_include_dir@ glibcpp_basedir = @glibcpp_basedir@ diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 9bbb3b3bc006..03488e758b17 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -155,19 +155,36 @@ AC_SUBST(GLIBCPP_CXXFLAGS) dnl dnl Check to see if g++ can compile this library, and if so, if any version- -dnl specific precautions need to be taken. In particular, test for -dnl newer compiler features, or features that are present in newer +dnl specific precautions need to be taken. +dnl +dnl GLIBCPP_CHECK_COMPILER_VERSION +AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ + + # Sanity check that g++ is capable of dealing with v-3. + AC_MSG_CHECKING([for g++ that will successfully compile this code]) + AC_EGREP_CPP([ok], [ + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) + ok + #endif + ], gpp_satisfactory=yes, AC_MSG_ERROR("please upgrade to gcc-2.95 or above")) + AC_MSG_RESULT($gpp_satisfactory) +]) + + +dnl +dnl Test for newer compiler features, or features that are present in newer dnl compiler version but not older compiler versions should be placed dnl here. dnl -dnl Define FMTFLAGS='-fdiagnostics-show-location=once' if possible +dnl Define WFMT_FLAGS='-fdiagnostics-show-location=once' if possible +dnl dnl Define WERROR='-Werror' if possible; g++'s that lack the new inlining -dnl code or the new system_header pragma will die. Other options dealing -dnl with warnings, errors, and compiler complaints may be folded into -dnl the WERROR variable. +dnl code or the new system_header pragma will die. dnl -dnl GLIBCPP_CHECK_COMPILER_VERSION -AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ +dnl Define SECTION_FLAGS='-ffunction-sections -fdata-sections' if +dnl compiler supports it. +dnl GLIBCPP_CHECK_COMPILER_FEATURES +AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [ # All these tests are for C++; save the language and the compiler flags. # The CXXFLAGS thing is suspicious, but based on similar bits # found in GLIBCPP_CONFIGURE. @@ -177,15 +194,6 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ ac_save_CXXFLAGS="$CXXFLAGS" WERROR='-Werror' - # Sanity check that g++ is capable of dealing with v-3. - AC_MSG_CHECKING([for g++ that will successfully compile this code]) - AC_EGREP_CPP([ok], [ - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) - ok - #endif - ], gpp_satisfactory=yes, AC_MSG_ERROR("please upgrade to gcc-2.95 or above")) - AC_MSG_RESULT($gpp_satisfactory) - # Check for pragma system_header. AC_MSG_CHECKING([for g++ that supports pragma system_header]) CXXFLAGS='-Wunknown-pragmas -Werror' @@ -214,15 +222,66 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ CXXFLAGS='' fi if test "$ac_gabydiags" = "yes"; then - FMTFLAGS='-fdiagnostics-show-location=once' + WFMT_FLAGS='-fdiagnostics-show-location=once' fi AC_MSG_RESULT($ac_gabydiags) + # Check for -ffunction-sections -fdata-sections + AC_MSG_CHECKING([for g++ that supports -ffunction-sections -fdata-sections]) + CXXFLAGS='-ffunction-sections -fdata-sections' + AC_TRY_COMPILE(, [int foo; + ], [ac_fdsections=yes], [ac_fdsections=no]) + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_fdsections" = "yes"; then + SECTION_FLAGS='-ffunction-sections -fdata-sections' + fi + AC_MSG_RESULT($ac_fdsections) + AC_LANG_RESTORE AC_SUBST(WERROR) - AC_SUBST(FMTFLAGS) + AC_SUBST(WFMT_FLAGS) + AC_SUBST(SECTION_FLAGS) ]) + +dnl +dnl Check to see if tricky linker opts can be used. +dnl +dnl Define SECTION_LDFLAGS='-Wl,--gc-sections' if possible +dnl GLIBCPP_CHECK_LINKER_FEATURES +AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ + # All these tests are for C++; save the language and the compiler flags. + # The CXXFLAGS thing is suspicious, but based on similar bits + # found in GLIBCPP_CONFIGURE. + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + # Check for -Wl,--gc-sections + AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections]) + CXXFLAGS='-Wl,--gc-sections' + AC_TRY_COMPILE(, [int foo; + ], [ac_sectionLDflags=yes], [ac_sectionLFflags=no]) + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_sectionLDflags" = "yes"; then + SECTION_LDFLAGS='-Wl,--gc-sections' + fi + AC_MSG_RESULT($ac_sectionLDflags) + + AC_LANG_RESTORE + AC_SUBST(SECTION_LDFLAGS) +]) + + dnl dnl Check to see what builtin math functions are supported dnl @@ -841,7 +900,7 @@ dnl dnl GLIBCPP_CHECK_CPU AC_DEFUN(GLIBCPP_CHECK_CPU, [ AC_MSG_CHECKING([for cpu primitives directory]) - CPUFLAGS= + CPU_FLAGS= case "$target_cpu" in alpha*) cpu_include_dir="config/cpu/alpha" @@ -857,7 +916,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ ;; powerpc | rs6000) cpu_include_dir="config/cpu/powerpc" - CPUFLAGS='-mcpu=powerpc' + CPU_FLAGS='-mcpu=powerpc' ;; sparc64 | ultrasparc) cpu_include_dir="config/cpu/sparc/sparc64" @@ -871,7 +930,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ esac AC_MSG_RESULT($cpu_include_dir) AC_SUBST(cpu_include_dir) - AC_SUBST(CPUFLAGS) + AC_SUBST(CPU_FLAGS) ]) @@ -1270,13 +1329,13 @@ enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl dnl Option parsed, now set things appropriately case "$enable_debug" in yes) - DEBUGFLAGS='-O0 -ggdb' + DEBUG_FLAGS='-O0 -ggdb' ;; no) - DEBUGFLAGS='-g' + DEBUG_FLAGS='-g' ;; esac -AC_SUBST(DEBUGFLAGS) +AC_SUBST(DEBUG_FLAGS) ]) diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index bfe90f2dc5ed..b4842be496aa 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -167,19 +167,36 @@ AC_SUBST(GLIBCPP_CXXFLAGS) dnl dnl Check to see if g++ can compile this library, and if so, if any version- -dnl specific precautions need to be taken. In particular, test for -dnl newer compiler features, or features that are present in newer +dnl specific precautions need to be taken. +dnl +dnl GLIBCPP_CHECK_COMPILER_VERSION +AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ + + # Sanity check that g++ is capable of dealing with v-3. + AC_MSG_CHECKING([for g++ that will successfully compile this code]) + AC_EGREP_CPP([ok], [ + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) + ok + #endif + ], gpp_satisfactory=yes, AC_MSG_ERROR("please upgrade to gcc-2.95 or above")) + AC_MSG_RESULT($gpp_satisfactory) +]) + + +dnl +dnl Test for newer compiler features, or features that are present in newer dnl compiler version but not older compiler versions should be placed dnl here. dnl -dnl Define FMTFLAGS='-fdiagnostics-show-location=once' if possible +dnl Define WFMT_FLAGS='-fdiagnostics-show-location=once' if possible +dnl dnl Define WERROR='-Werror' if possible; g++'s that lack the new inlining -dnl code or the new system_header pragma will die. Other options dealing -dnl with warnings, errors, and compiler complaints may be folded into -dnl the WERROR variable. +dnl code or the new system_header pragma will die. dnl -dnl GLIBCPP_CHECK_COMPILER_VERSION -AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ +dnl Define SECTION_FLAGS='-ffunction-sections -fdata-sections' if +dnl compiler supports it. +dnl GLIBCPP_CHECK_COMPILER_FEATURES +AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [ # All these tests are for C++; save the language and the compiler flags. # The CXXFLAGS thing is suspicious, but based on similar bits # found in GLIBCPP_CONFIGURE. @@ -189,15 +206,6 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ ac_save_CXXFLAGS="$CXXFLAGS" WERROR='-Werror' - # Sanity check that g++ is capable of dealing with v-3. - AC_MSG_CHECKING([for g++ that will successfully compile this code]) - AC_EGREP_CPP([ok], [ - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) - ok - #endif - ], gpp_satisfactory=yes, AC_MSG_ERROR("please upgrade to gcc-2.95 or above")) - AC_MSG_RESULT($gpp_satisfactory) - # Check for pragma system_header. AC_MSG_CHECKING([for g++ that supports pragma system_header]) CXXFLAGS='-Wunknown-pragmas -Werror' @@ -226,15 +234,66 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ CXXFLAGS='' fi if test "$ac_gabydiags" = "yes"; then - FMTFLAGS='-fdiagnostics-show-location=once' + WFMT_FLAGS='-fdiagnostics-show-location=once' fi AC_MSG_RESULT($ac_gabydiags) + # Check for -ffunction-sections -fdata-sections + AC_MSG_CHECKING([for g++ that supports -ffunction-sections -fdata-sections]) + CXXFLAGS='-ffunction-sections -fdata-sections' + AC_TRY_COMPILE(, [int foo; + ], [ac_fdsections=yes], [ac_fdsections=no]) + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_fdsections" = "yes"; then + SECTION_FLAGS='-ffunction-sections -fdata-sections' + fi + AC_MSG_RESULT($ac_fdsections) + AC_LANG_RESTORE AC_SUBST(WERROR) - AC_SUBST(FMTFLAGS) + AC_SUBST(WFMT_FLAGS) + AC_SUBST(SECTION_FLAGS) ]) + +dnl +dnl Check to see if tricky linker opts can be used. +dnl +dnl Define SECTION_LDFLAGS='-Wl,--gc-sections' if possible +dnl GLIBCPP_CHECK_LINKER_FEATURES +AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ + # All these tests are for C++; save the language and the compiler flags. + # The CXXFLAGS thing is suspicious, but based on similar bits + # found in GLIBCPP_CONFIGURE. + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + # Check for -Wl,--gc-sections + AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections]) + CXXFLAGS='-Wl,--gc-sections' + AC_TRY_COMPILE(, [int foo; + ], [ac_sectionLDflags=yes], [ac_sectionLFflags=no]) + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_sectionLDflags" = "yes"; then + SECTION_LDFLAGS='-Wl,--gc-sections' + fi + AC_MSG_RESULT($ac_sectionLDflags) + + AC_LANG_RESTORE + AC_SUBST(SECTION_LDFLAGS) +]) + + dnl dnl Check to see what builtin math functions are supported dnl @@ -853,7 +912,7 @@ dnl dnl GLIBCPP_CHECK_CPU AC_DEFUN(GLIBCPP_CHECK_CPU, [ AC_MSG_CHECKING([for cpu primitives directory]) - CPUFLAGS= + CPU_FLAGS= case "$target_cpu" in alpha*) cpu_include_dir="config/cpu/alpha" @@ -869,7 +928,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ ;; powerpc | rs6000) cpu_include_dir="config/cpu/powerpc" - CPUFLAGS='-mcpu=powerpc' + CPU_FLAGS='-mcpu=powerpc' ;; sparc64 | ultrasparc) cpu_include_dir="config/cpu/sparc/sparc64" @@ -883,7 +942,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ esac AC_MSG_RESULT($cpu_include_dir) AC_SUBST(cpu_include_dir) - AC_SUBST(CPUFLAGS) + AC_SUBST(CPU_FLAGS) ]) @@ -1282,13 +1341,13 @@ enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl dnl Option parsed, now set things appropriately case "$enable_debug" in yes) - DEBUGFLAGS='-O0 -ggdb' + DEBUG_FLAGS='-O0 -ggdb' ;; no) - DEBUGFLAGS='-g' + DEBUG_FLAGS='-g' ;; esac -AC_SUBST(DEBUGFLAGS) +AC_SUBST(DEBUG_FLAGS) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 16086f69ebc5..9eb6a844405b 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -1994,26 +1994,29 @@ exec 5>>./config.log # Check for c++ or library specific bits that don't require linking. -echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1999: checking how to run the C++ preprocessor" >&5 -if test -z "$CXXCPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:1999: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2012 "configure" +#line 2014 "configure" #include "confdefs.h" -#include <stdlib.h> +#include <assert.h> +Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2022,42 +2025,62 @@ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - CXXCPP=/lib/cpp + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +#line 2031 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 2048 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp fi rm -f conftest* - ac_cv_prog_CXXCPP="$CXXCPP" -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross fi +rm -f conftest* fi -CXXCPP="$ac_cv_prog_CXXCPP" -echo "$ac_t""$CXXCPP" 1>&6 - +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 - # All these tests are for C++; save the language and the compiler flags. - # The CXXFLAGS thing is suspicious, but based on similar bits - # found in GLIBCPP_CONFIGURE. - - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - WERROR='-Werror' # Sanity check that g++ is capable of dealing with v-3. echo $ac_n "checking for g++ that will successfully compile this code""... $ac_c" 1>&6 -echo "configure:2059: checking for g++ that will successfully compile this code" >&5 +echo "configure:2082: checking for g++ that will successfully compile this code" >&5 cat > conftest.$ac_ext <<EOF -#line 2061 "configure" +#line 2084 "configure" #include "confdefs.h" #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) @@ -2077,88 +2100,10 @@ rm -f conftest* echo "$ac_t""$gpp_satisfactory" 1>&6 - # Check for pragma system_header. - echo $ac_n "checking for g++ that supports pragma system_header""... $ac_c" 1>&6 -echo "configure:2083: checking for g++ that supports pragma system_header" >&5 - CXXFLAGS='-Wunknown-pragmas -Werror' - cat > conftest.$ac_ext <<EOF -#line 2086 "configure" -#include "confdefs.h" -#pragma system_header -int main() { -int foo; - -; return 0; } -EOF -if { (eval echo configure:2094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_newpragma=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_newpragma=no -fi -rm -f conftest* - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" - else - # this is the suspicious part - CXXFLAGS='' - fi - if test "$ac_newpragma" = "no"; then - WERROR="$WERROR -Wno-unknown-pragmas" - fi - echo "$ac_t""$ac_newpragma" 1>&6 - - # Check for more sophisticated diagnostic control. - echo $ac_n "checking for g++ that supports -fdiagnostics-show-location=once""... $ac_c" 1>&6 -echo "configure:2117: checking for g++ that supports -fdiagnostics-show-location=once" >&5 - CXXFLAGS='-fdiagnostics-show-location=once' - cat > conftest.$ac_ext <<EOF -#line 2120 "configure" -#include "confdefs.h" - -int main() { -int foo; - -; return 0; } -EOF -if { (eval echo configure:2128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_gabydiags=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_gabydiags=no -fi -rm -f conftest* - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" - else - # this is the suspicious part - CXXFLAGS='' - fi - if test "$ac_gabydiags" = "yes"; then - FMTFLAGS='-fdiagnostics-show-location=once' - fi - echo "$ac_t""$ac_gabydiags" 1>&6 - - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - - - - echo $ac_n "checking for cpu primitives directory""... $ac_c" 1>&6 -echo "configure:2161: checking for cpu primitives directory" >&5 - CPUFLAGS= +echo "configure:2106: checking for cpu primitives directory" >&5 + CPU_FLAGS= case "$target_cpu" in alpha*) cpu_include_dir="config/cpu/alpha" @@ -2174,7 +2119,7 @@ echo "configure:2161: checking for cpu primitives directory" >&5 ;; powerpc | rs6000) cpu_include_dir="config/cpu/powerpc" - CPUFLAGS='-mcpu=powerpc' + CPU_FLAGS='-mcpu=powerpc' ;; sparc64 | ultrasparc) cpu_include_dir="config/cpu/sparc/sparc64" @@ -2205,97 +2150,17 @@ else fi case "$enable_debug" in yes) - DEBUGFLAGS='-O0 -ggdb' + DEBUG_FLAGS='-O0 -ggdb' ;; no) - DEBUGFLAGS='-g' + DEBUG_FLAGS='-g' ;; esac -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2218: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF -#line 2233 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF -#line 2250 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF -#line 2267 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6 -echo "configure:2299: checking for cstdio to use" >&5 +echo "configure:2164: checking for cstdio to use" >&5 # Check whether --enable-cstdio or --disable-cstdio was given. if test "${enable_cstdio+set}" = set; then enableval="$enable_cstdio" @@ -2319,17 +2184,17 @@ fi # see if we are on a system with libio native (ie, linux) ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libio.h""... $ac_c" 1>&6 -echo "configure:2323: checking for libio.h" >&5 +echo "configure:2188: checking for libio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2328 "configure" +#line 2193 "configure" #include "confdefs.h" #include <libio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2364,17 +2229,17 @@ fi # NB: This replaces the _G_CONFIG_H machinery in libio-v2 ac_safe=`echo "_G_config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for _G_config.h""... $ac_c" 1>&6 -echo "configure:2368: checking for _G_config.h" >&5 +echo "configure:2233: checking for _G_config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2373 "configure" +#line 2238 "configure" #include "confdefs.h" #include <_G_config.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2447,12 +2312,12 @@ fi # Check for the existance of functions used if long long is enabled. echo $ac_n "checking for strtoll""... $ac_c" 1>&6 -echo "configure:2451: checking for strtoll" >&5 +echo "configure:2316: checking for strtoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtoll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2456 "configure" +#line 2321 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtoll(); below. */ @@ -2475,7 +2340,7 @@ strtoll(); ; return 0; } EOF -if { (eval echo configure:2479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtoll=yes" else @@ -2496,12 +2361,12 @@ ac_strtoll=no fi echo $ac_n "checking for strtoull""... $ac_c" 1>&6 -echo "configure:2500: checking for strtoull" >&5 +echo "configure:2365: checking for strtoull" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtoull'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2505 "configure" +#line 2370 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtoull(); below. */ @@ -2524,7 +2389,7 @@ strtoull(); ; return 0; } EOF -if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtoull=yes" else @@ -2546,7 +2411,7 @@ fi echo $ac_n "checking for enabled long long""... $ac_c" 1>&6 -echo "configure:2550: checking for enabled long long" >&5 +echo "configure:2415: checking for enabled long long" >&5 if test x"$ac_strtoll" = xno || test x"$ac_strtoull" = xno; then enable_long_long=no; fi; @@ -2561,7 +2426,7 @@ EOF esac echo $ac_n "checking for enabled cshadow headers""... $ac_c" 1>&6 -echo "configure:2565: checking for enabled cshadow headers" >&5 +echo "configure:2430: checking for enabled cshadow headers" >&5 # Check whether --enable-cshadow-headers or --disable-cshadow-headers was given. if test "${enable_cshadow_headers+set}" = set; then enableval="$enable_cshadow_headers" @@ -2602,7 +2467,7 @@ fi echo $ac_n "checking for threads package to use""... $ac_c" 1>&6 -echo "configure:2606: checking for threads package to use" >&5 +echo "configure:2471: checking for threads package to use" >&5 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -2665,17 +2530,17 @@ fi posix) ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 -echo "configure:2669: checking for pthread.h" >&5 +echo "configure:2534: checking for pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2674 "configure" +#line 2539 "configure" #include "confdefs.h" #include <pthread.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2864,17 +2729,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2868: checking for $ac_hdr" >&5 +echo "configure:2733: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2873 "configure" +#line 2738 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2902,9 +2767,194 @@ done + # All these tests are for C++; save the language and the compiler flags. + # The CXXFLAGS thing is suspicious, but based on similar bits + # found in GLIBCPP_CONFIGURE. + + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + ac_test_CXXFLAGS="${CXXFLAGS+set}" + ac_save_CXXFLAGS="$CXXFLAGS" + WERROR='-Werror' + + # Check for pragma system_header. + echo $ac_n "checking for g++ that supports pragma system_header""... $ac_c" 1>&6 +echo "configure:2788: checking for g++ that supports pragma system_header" >&5 + CXXFLAGS='-Wunknown-pragmas -Werror' + cat > conftest.$ac_ext <<EOF +#line 2791 "configure" +#include "confdefs.h" +#pragma system_header +int main() { +int foo; + +; return 0; } +EOF +if { (eval echo configure:2799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_newpragma=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_newpragma=no +fi +rm -f conftest* + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_newpragma" = "no"; then + WERROR="$WERROR -Wno-unknown-pragmas" + fi + echo "$ac_t""$ac_newpragma" 1>&6 + + # Check for more sophisticated diagnostic control. + echo $ac_n "checking for g++ that supports -fdiagnostics-show-location=once""... $ac_c" 1>&6 +echo "configure:2822: checking for g++ that supports -fdiagnostics-show-location=once" >&5 + CXXFLAGS='-fdiagnostics-show-location=once' + cat > conftest.$ac_ext <<EOF +#line 2825 "configure" +#include "confdefs.h" + +int main() { +int foo; + +; return 0; } +EOF +if { (eval echo configure:2833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_gabydiags=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_gabydiags=no +fi +rm -f conftest* + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_gabydiags" = "yes"; then + WFMT_FLAGS='-fdiagnostics-show-location=once' + fi + echo "$ac_t""$ac_gabydiags" 1>&6 + + # Check for -ffunction-sections -fdata-sections + echo $ac_n "checking for g++ that supports -ffunction-sections -fdata-sections""... $ac_c" 1>&6 +echo "configure:2856: checking for g++ that supports -ffunction-sections -fdata-sections" >&5 + CXXFLAGS='-ffunction-sections -fdata-sections' + cat > conftest.$ac_ext <<EOF +#line 2859 "configure" +#include "confdefs.h" + +int main() { +int foo; + +; return 0; } +EOF +if { (eval echo configure:2867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_fdsections=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_fdsections=no +fi +rm -f conftest* + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_fdsections" = "yes"; then + SECTION_FLAGS='-ffunction-sections -fdata-sections' + fi + echo "$ac_t""$ac_fdsections" 1>&6 + + ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + + + + + + # All these tests are for C++; save the language and the compiler flags. + # The CXXFLAGS thing is suspicious, but based on similar bits + # found in GLIBCPP_CONFIGURE. + + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + + # Check for -Wl,--gc-sections + echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 +echo "configure:2914: checking for ld that supports -Wl,--gc-sections" >&5 + CXXFLAGS='-Wl,--gc-sections' + cat > conftest.$ac_ext <<EOF +#line 2917 "configure" +#include "confdefs.h" + +int main() { +int foo; + +; return 0; } +EOF +if { (eval echo configure:2925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_sectionLDflags=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_sectionLFflags=no +fi +rm -f conftest* + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + else + # this is the suspicious part + CXXFLAGS='' + fi + if test "$ac_sectionLDflags" = "yes"; then + SECTION_LDFLAGS='-Wl,--gc-sections' + fi + echo "$ac_t""$ac_sectionLDflags" 1>&6 + + ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + + + echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6 -echo "configure:2908: checking for GNU C++ __complex__ support" >&5 +echo "configure:2958: checking for GNU C++ __complex__ support" >&5 if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2918,7 +2968,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 2922 "configure" +#line 2972 "configure" #include "confdefs.h" struct dcomplex { __complex__ double x; }; \ dcomplex f(const dcomplex& x) { return dcomplex(x); } @@ -2927,7 +2977,7 @@ int main() { dcomplex x; f(x); ; return 0; } EOF -if { (eval echo configure:2931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_complex=ok else @@ -2959,7 +3009,7 @@ EOF echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6 -echo "configure:2963: checking for GNU C++ __complex__ float support" >&5 +echo "configure:3013: checking for GNU C++ __complex__ float support" >&5 if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2992,14 +3042,14 @@ cross_compiling=$ac_cv_prog_cxx_cross }; EOB cat > conftest.$ac_ext <<EOF -#line 2996 "configure" +#line 3046 "configure" #include "confdefs.h" #include "conftest.h" int main() { ; return 0; } EOF -if { (eval echo configure:3003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_float_complex=ok else @@ -3038,16 +3088,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for __builtin_acos""... $ac_c" 1>&6 -echo "configure:3042: checking for __builtin_acos" >&5 +echo "configure:3092: checking for __builtin_acos" >&5 cat > conftest.$ac_ext <<EOF -#line 3044 "configure" +#line 3094 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_acos(0.0); ; return 0; } EOF -if { (eval echo configure:3051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_acos=yes else @@ -3065,16 +3115,16 @@ EOF fi echo $ac_n "checking for __builtin_acosf""... $ac_c" 1>&6 -echo "configure:3069: checking for __builtin_acosf" >&5 +echo "configure:3119: checking for __builtin_acosf" >&5 cat > conftest.$ac_ext <<EOF -#line 3071 "configure" +#line 3121 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_acosf(0.0); ; return 0; } EOF -if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_acosf=yes else @@ -3092,16 +3142,16 @@ EOF fi echo $ac_n "checking for __builtin_acosl""... $ac_c" 1>&6 -echo "configure:3096: checking for __builtin_acosl" >&5 +echo "configure:3146: checking for __builtin_acosl" >&5 cat > conftest.$ac_ext <<EOF -#line 3098 "configure" +#line 3148 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_acosl(0.0); ; return 0; } EOF -if { (eval echo configure:3105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_acosl=yes else @@ -3119,16 +3169,16 @@ EOF fi echo $ac_n "checking for __builtin_asin""... $ac_c" 1>&6 -echo "configure:3123: checking for __builtin_asin" >&5 +echo "configure:3173: checking for __builtin_asin" >&5 cat > conftest.$ac_ext <<EOF -#line 3125 "configure" +#line 3175 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_asin(0.0); ; return 0; } EOF -if { (eval echo configure:3132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_asin=yes else @@ -3146,16 +3196,16 @@ EOF fi echo $ac_n "checking for __builtin_asinf""... $ac_c" 1>&6 -echo "configure:3150: checking for __builtin_asinf" >&5 +echo "configure:3200: checking for __builtin_asinf" >&5 cat > conftest.$ac_ext <<EOF -#line 3152 "configure" +#line 3202 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_asinf(0.0); ; return 0; } EOF -if { (eval echo configure:3159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_asinf=yes else @@ -3173,16 +3223,16 @@ EOF fi echo $ac_n "checking for __builtin_asinl""... $ac_c" 1>&6 -echo "configure:3177: checking for __builtin_asinl" >&5 +echo "configure:3227: checking for __builtin_asinl" >&5 cat > conftest.$ac_ext <<EOF -#line 3179 "configure" +#line 3229 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_asinl(0.0); ; return 0; } EOF -if { (eval echo configure:3186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_asinl=yes else @@ -3200,16 +3250,16 @@ EOF fi echo $ac_n "checking for __builtin_atan""... $ac_c" 1>&6 -echo "configure:3204: checking for __builtin_atan" >&5 +echo "configure:3254: checking for __builtin_atan" >&5 cat > conftest.$ac_ext <<EOF -#line 3206 "configure" +#line 3256 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_atan(0.0); ; return 0; } EOF -if { (eval echo configure:3213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_atan=yes else @@ -3227,16 +3277,16 @@ EOF fi echo $ac_n "checking for __builtin_atanf""... $ac_c" 1>&6 -echo "configure:3231: checking for __builtin_atanf" >&5 +echo "configure:3281: checking for __builtin_atanf" >&5 cat > conftest.$ac_ext <<EOF -#line 3233 "configure" +#line 3283 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_atanf(0.0); ; return 0; } EOF -if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_atanf=yes else @@ -3254,16 +3304,16 @@ EOF fi echo $ac_n "checking for __builtin_atanl""... $ac_c" 1>&6 -echo "configure:3258: checking for __builtin_atanl" >&5 +echo "configure:3308: checking for __builtin_atanl" >&5 cat > conftest.$ac_ext <<EOF -#line 3260 "configure" +#line 3310 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_atanl(0.0); ; return 0; } EOF -if { (eval echo configure:3267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_atanl=yes else @@ -3281,16 +3331,16 @@ EOF fi echo $ac_n "checking for __builtin_atan2""... $ac_c" 1>&6 -echo "configure:3285: checking for __builtin_atan2" >&5 +echo "configure:3335: checking for __builtin_atan2" >&5 cat > conftest.$ac_ext <<EOF -#line 3287 "configure" +#line 3337 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_atan2(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:3294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_atan2=yes else @@ -3308,16 +3358,16 @@ EOF fi echo $ac_n "checking for __builtin_atan2f""... $ac_c" 1>&6 -echo "configure:3312: checking for __builtin_atan2f" >&5 +echo "configure:3362: checking for __builtin_atan2f" >&5 cat > conftest.$ac_ext <<EOF -#line 3314 "configure" +#line 3364 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_atan2f(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_atan2f=yes else @@ -3335,16 +3385,16 @@ EOF fi echo $ac_n "checking for __builtin_atan2l""... $ac_c" 1>&6 -echo "configure:3339: checking for __builtin_atan2l" >&5 +echo "configure:3389: checking for __builtin_atan2l" >&5 cat > conftest.$ac_ext <<EOF -#line 3341 "configure" +#line 3391 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_atan2l(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_atan2l=yes else @@ -3362,16 +3412,16 @@ EOF fi echo $ac_n "checking for __builtin_ceil""... $ac_c" 1>&6 -echo "configure:3366: checking for __builtin_ceil" >&5 +echo "configure:3416: checking for __builtin_ceil" >&5 cat > conftest.$ac_ext <<EOF -#line 3368 "configure" +#line 3418 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fceil(0.0); ; return 0; } EOF -if { (eval echo configure:3375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_ceil=yes else @@ -3389,16 +3439,16 @@ EOF fi echo $ac_n "checking for __builtin_ceilf""... $ac_c" 1>&6 -echo "configure:3393: checking for __builtin_ceilf" >&5 +echo "configure:3443: checking for __builtin_ceilf" >&5 cat > conftest.$ac_ext <<EOF -#line 3395 "configure" +#line 3445 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_ceilf(0.0); ; return 0; } EOF -if { (eval echo configure:3402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_ceilf=yes else @@ -3416,16 +3466,16 @@ EOF fi echo $ac_n "checking for __builtin_ceill""... $ac_c" 1>&6 -echo "configure:3420: checking for __builtin_ceill" >&5 +echo "configure:3470: checking for __builtin_ceill" >&5 cat > conftest.$ac_ext <<EOF -#line 3422 "configure" +#line 3472 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_ceill(0.0); ; return 0; } EOF -if { (eval echo configure:3429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_ceill=yes else @@ -3443,16 +3493,16 @@ EOF fi echo $ac_n "checking for __builtin_cos""... $ac_c" 1>&6 -echo "configure:3447: checking for __builtin_cos" >&5 +echo "configure:3497: checking for __builtin_cos" >&5 cat > conftest.$ac_ext <<EOF -#line 3449 "configure" +#line 3499 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cos(0.0); ; return 0; } EOF -if { (eval echo configure:3456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_cos=yes else @@ -3470,16 +3520,16 @@ EOF fi echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6 -echo "configure:3474: checking for __builtin_cosf" >&5 +echo "configure:3524: checking for __builtin_cosf" >&5 cat > conftest.$ac_ext <<EOF -#line 3476 "configure" +#line 3526 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cosf(0.0); ; return 0; } EOF -if { (eval echo configure:3483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_cosf=yes else @@ -3497,16 +3547,16 @@ EOF fi echo $ac_n "checking for __builtin_cosl""... $ac_c" 1>&6 -echo "configure:3501: checking for __builtin_cosl" >&5 +echo "configure:3551: checking for __builtin_cosl" >&5 cat > conftest.$ac_ext <<EOF -#line 3503 "configure" +#line 3553 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cosl(0.0); ; return 0; } EOF -if { (eval echo configure:3510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_cosl=yes else @@ -3524,16 +3574,16 @@ EOF fi echo $ac_n "checking for __builtin_cosh""... $ac_c" 1>&6 -echo "configure:3528: checking for __builtin_cosh" >&5 +echo "configure:3578: checking for __builtin_cosh" >&5 cat > conftest.$ac_ext <<EOF -#line 3530 "configure" +#line 3580 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cosh(0.0); ; return 0; } EOF -if { (eval echo configure:3537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_cosh=yes else @@ -3551,16 +3601,16 @@ EOF fi echo $ac_n "checking for __builtin_coshf""... $ac_c" 1>&6 -echo "configure:3555: checking for __builtin_coshf" >&5 +echo "configure:3605: checking for __builtin_coshf" >&5 cat > conftest.$ac_ext <<EOF -#line 3557 "configure" +#line 3607 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_coshf(0.0); ; return 0; } EOF -if { (eval echo configure:3564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_coshf=yes else @@ -3578,16 +3628,16 @@ EOF fi echo $ac_n "checking for __builtin_coshl""... $ac_c" 1>&6 -echo "configure:3582: checking for __builtin_coshl" >&5 +echo "configure:3632: checking for __builtin_coshl" >&5 cat > conftest.$ac_ext <<EOF -#line 3584 "configure" +#line 3634 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_coshl(0.0); ; return 0; } EOF -if { (eval echo configure:3591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_coshl=yes else @@ -3605,16 +3655,16 @@ EOF fi echo $ac_n "checking for __builtin_exp""... $ac_c" 1>&6 -echo "configure:3609: checking for __builtin_exp" >&5 +echo "configure:3659: checking for __builtin_exp" >&5 cat > conftest.$ac_ext <<EOF -#line 3611 "configure" +#line 3661 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_exp(0.0); ; return 0; } EOF -if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_exp=yes else @@ -3632,16 +3682,16 @@ EOF fi echo $ac_n "checking for __builtin_expf""... $ac_c" 1>&6 -echo "configure:3636: checking for __builtin_expf" >&5 +echo "configure:3686: checking for __builtin_expf" >&5 cat > conftest.$ac_ext <<EOF -#line 3638 "configure" +#line 3688 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_expf(0.0); ; return 0; } EOF -if { (eval echo configure:3645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_expf=yes else @@ -3659,16 +3709,16 @@ EOF fi echo $ac_n "checking for __builtin_expl""... $ac_c" 1>&6 -echo "configure:3663: checking for __builtin_expl" >&5 +echo "configure:3713: checking for __builtin_expl" >&5 cat > conftest.$ac_ext <<EOF -#line 3665 "configure" +#line 3715 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_expl(0.0); ; return 0; } EOF -if { (eval echo configure:3672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_expl=yes else @@ -3686,16 +3736,16 @@ EOF fi echo $ac_n "checking for __builtin_fabs""... $ac_c" 1>&6 -echo "configure:3690: checking for __builtin_fabs" >&5 +echo "configure:3740: checking for __builtin_fabs" >&5 cat > conftest.$ac_ext <<EOF -#line 3692 "configure" +#line 3742 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabs(0.0); ; return 0; } EOF -if { (eval echo configure:3699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_fabs=yes else @@ -3713,16 +3763,16 @@ EOF fi echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6 -echo "configure:3717: checking for __builtin_fabsf" >&5 +echo "configure:3767: checking for __builtin_fabsf" >&5 cat > conftest.$ac_ext <<EOF -#line 3719 "configure" +#line 3769 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabsf(0.0); ; return 0; } EOF -if { (eval echo configure:3726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_fabsf=yes else @@ -3740,16 +3790,16 @@ EOF fi echo $ac_n "checking for __builtin_fabsl""... $ac_c" 1>&6 -echo "configure:3744: checking for __builtin_fabsl" >&5 +echo "configure:3794: checking for __builtin_fabsl" >&5 cat > conftest.$ac_ext <<EOF -#line 3746 "configure" +#line 3796 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabsl(0.0); ; return 0; } EOF -if { (eval echo configure:3753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_fabsl=yes else @@ -3767,16 +3817,16 @@ EOF fi echo $ac_n "checking for __builtin_floor""... $ac_c" 1>&6 -echo "configure:3771: checking for __builtin_floor" >&5 +echo "configure:3821: checking for __builtin_floor" >&5 cat > conftest.$ac_ext <<EOF -#line 3773 "configure" +#line 3823 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_floor(0.0); ; return 0; } EOF -if { (eval echo configure:3780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_floor=yes else @@ -3794,16 +3844,16 @@ EOF fi echo $ac_n "checking for __builtin_floorf""... $ac_c" 1>&6 -echo "configure:3798: checking for __builtin_floorf" >&5 +echo "configure:3848: checking for __builtin_floorf" >&5 cat > conftest.$ac_ext <<EOF -#line 3800 "configure" +#line 3850 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_floorf(0.0); ; return 0; } EOF -if { (eval echo configure:3807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_floorf=yes else @@ -3821,16 +3871,16 @@ EOF fi echo $ac_n "checking for __builtin_floorl""... $ac_c" 1>&6 -echo "configure:3825: checking for __builtin_floorl" >&5 +echo "configure:3875: checking for __builtin_floorl" >&5 cat > conftest.$ac_ext <<EOF -#line 3827 "configure" +#line 3877 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_floorl(0.0); ; return 0; } EOF -if { (eval echo configure:3834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_floorl=yes else @@ -3848,16 +3898,16 @@ EOF fi echo $ac_n "checking for __builtin_fmod""... $ac_c" 1>&6 -echo "configure:3852: checking for __builtin_fmod" >&5 +echo "configure:3902: checking for __builtin_fmod" >&5 cat > conftest.$ac_ext <<EOF -#line 3854 "configure" +#line 3904 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fmod(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:3861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_fmod=yes else @@ -3875,16 +3925,16 @@ EOF fi echo $ac_n "checking for __builtin_fmodf""... $ac_c" 1>&6 -echo "configure:3879: checking for __builtin_fmodf" >&5 +echo "configure:3929: checking for __builtin_fmodf" >&5 cat > conftest.$ac_ext <<EOF -#line 3881 "configure" +#line 3931 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fmodf(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:3888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_fmodf=yes else @@ -3902,16 +3952,16 @@ EOF fi echo $ac_n "checking for __builtin_fmodl""... $ac_c" 1>&6 -echo "configure:3906: checking for __builtin_fmodl" >&5 +echo "configure:3956: checking for __builtin_fmodl" >&5 cat > conftest.$ac_ext <<EOF -#line 3908 "configure" +#line 3958 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fmodl(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:3915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_fmodl=yes else @@ -3929,16 +3979,16 @@ EOF fi echo $ac_n "checking for __builtin_frexp""... $ac_c" 1>&6 -echo "configure:3933: checking for __builtin_frexp" >&5 +echo "configure:3983: checking for __builtin_frexp" >&5 cat > conftest.$ac_ext <<EOF -#line 3935 "configure" +#line 3985 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_frexp(0.0, 0); ; return 0; } EOF -if { (eval echo configure:3942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_frexp=yes else @@ -3956,16 +4006,16 @@ EOF fi echo $ac_n "checking for __builtin_frexpf""... $ac_c" 1>&6 -echo "configure:3960: checking for __builtin_frexpf" >&5 +echo "configure:4010: checking for __builtin_frexpf" >&5 cat > conftest.$ac_ext <<EOF -#line 3962 "configure" +#line 4012 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_frexpf(0.0, 0); ; return 0; } EOF -if { (eval echo configure:3969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_frexpf=yes else @@ -3983,16 +4033,16 @@ EOF fi echo $ac_n "checking for __builtin_frexpl""... $ac_c" 1>&6 -echo "configure:3987: checking for __builtin_frexpl" >&5 +echo "configure:4037: checking for __builtin_frexpl" >&5 cat > conftest.$ac_ext <<EOF -#line 3989 "configure" +#line 4039 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_frexpl(0.0, 0); ; return 0; } EOF -if { (eval echo configure:3996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_frexpl=yes else @@ -4010,16 +4060,16 @@ EOF fi echo $ac_n "checking for __builtin_ldexp""... $ac_c" 1>&6 -echo "configure:4014: checking for __builtin_ldexp" >&5 +echo "configure:4064: checking for __builtin_ldexp" >&5 cat > conftest.$ac_ext <<EOF -#line 4016 "configure" +#line 4066 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_ldexp(0.0, 0); ; return 0; } EOF -if { (eval echo configure:4023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_ldexp=yes else @@ -4037,16 +4087,16 @@ EOF fi echo $ac_n "checking for __builtin_ldexpf""... $ac_c" 1>&6 -echo "configure:4041: checking for __builtin_ldexpf" >&5 +echo "configure:4091: checking for __builtin_ldexpf" >&5 cat > conftest.$ac_ext <<EOF -#line 4043 "configure" +#line 4093 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_ldexpf(0.0, 0); ; return 0; } EOF -if { (eval echo configure:4050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_ldexpf=yes else @@ -4064,16 +4114,16 @@ EOF fi echo $ac_n "checking for __builtin_ldexpl""... $ac_c" 1>&6 -echo "configure:4068: checking for __builtin_ldexpl" >&5 +echo "configure:4118: checking for __builtin_ldexpl" >&5 cat > conftest.$ac_ext <<EOF -#line 4070 "configure" +#line 4120 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_ldexpl(0.0, 0); ; return 0; } EOF -if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_ldexpl=yes else @@ -4091,16 +4141,16 @@ EOF fi echo $ac_n "checking for __builtin_log""... $ac_c" 1>&6 -echo "configure:4095: checking for __builtin_log" >&5 +echo "configure:4145: checking for __builtin_log" >&5 cat > conftest.$ac_ext <<EOF -#line 4097 "configure" +#line 4147 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_log(0.0); ; return 0; } EOF -if { (eval echo configure:4104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_log=yes else @@ -4118,16 +4168,16 @@ EOF fi echo $ac_n "checking for __builtin_logf""... $ac_c" 1>&6 -echo "configure:4122: checking for __builtin_logf" >&5 +echo "configure:4172: checking for __builtin_logf" >&5 cat > conftest.$ac_ext <<EOF -#line 4124 "configure" +#line 4174 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_logf(0.0); ; return 0; } EOF -if { (eval echo configure:4131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_logf=yes else @@ -4145,16 +4195,16 @@ EOF fi echo $ac_n "checking for __builtin_logl""... $ac_c" 1>&6 -echo "configure:4149: checking for __builtin_logl" >&5 +echo "configure:4199: checking for __builtin_logl" >&5 cat > conftest.$ac_ext <<EOF -#line 4151 "configure" +#line 4201 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_logl(0.0); ; return 0; } EOF -if { (eval echo configure:4158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_logl=yes else @@ -4172,16 +4222,16 @@ EOF fi echo $ac_n "checking for __builtin_log10""... $ac_c" 1>&6 -echo "configure:4176: checking for __builtin_log10" >&5 +echo "configure:4226: checking for __builtin_log10" >&5 cat > conftest.$ac_ext <<EOF -#line 4178 "configure" +#line 4228 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_log10(0.0); ; return 0; } EOF -if { (eval echo configure:4185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_log10=yes else @@ -4199,16 +4249,16 @@ EOF fi echo $ac_n "checking for __builtin_log10f""... $ac_c" 1>&6 -echo "configure:4203: checking for __builtin_log10f" >&5 +echo "configure:4253: checking for __builtin_log10f" >&5 cat > conftest.$ac_ext <<EOF -#line 4205 "configure" +#line 4255 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_log10f(0.0); ; return 0; } EOF -if { (eval echo configure:4212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_log10f=yes else @@ -4226,16 +4276,16 @@ EOF fi echo $ac_n "checking for __builtin_log10l""... $ac_c" 1>&6 -echo "configure:4230: checking for __builtin_log10l" >&5 +echo "configure:4280: checking for __builtin_log10l" >&5 cat > conftest.$ac_ext <<EOF -#line 4232 "configure" +#line 4282 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_log10l(0.0); ; return 0; } EOF -if { (eval echo configure:4239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_log10l=yes else @@ -4253,16 +4303,16 @@ EOF fi echo $ac_n "checking for __builtin_modf""... $ac_c" 1>&6 -echo "configure:4257: checking for __builtin_modf" >&5 +echo "configure:4307: checking for __builtin_modf" >&5 cat > conftest.$ac_ext <<EOF -#line 4259 "configure" +#line 4309 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_modf(0.0, 0); ; return 0; } EOF -if { (eval echo configure:4266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_modf=yes else @@ -4280,16 +4330,16 @@ EOF fi echo $ac_n "checking for __builtin_modff""... $ac_c" 1>&6 -echo "configure:4284: checking for __builtin_modff" >&5 +echo "configure:4334: checking for __builtin_modff" >&5 cat > conftest.$ac_ext <<EOF -#line 4286 "configure" +#line 4336 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_modff(0.0, 0); ; return 0; } EOF -if { (eval echo configure:4293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_modff=yes else @@ -4307,16 +4357,16 @@ EOF fi echo $ac_n "checking for __builtin_modfl""... $ac_c" 1>&6 -echo "configure:4311: checking for __builtin_modfl" >&5 +echo "configure:4361: checking for __builtin_modfl" >&5 cat > conftest.$ac_ext <<EOF -#line 4313 "configure" +#line 4363 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_modfl(0.0, 0); ; return 0; } EOF -if { (eval echo configure:4320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_modfl=yes else @@ -4334,16 +4384,16 @@ EOF fi echo $ac_n "checking for __builtin_pow""... $ac_c" 1>&6 -echo "configure:4338: checking for __builtin_pow" >&5 +echo "configure:4388: checking for __builtin_pow" >&5 cat > conftest.$ac_ext <<EOF -#line 4340 "configure" +#line 4390 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_pow(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:4347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_pow=yes else @@ -4361,16 +4411,16 @@ EOF fi echo $ac_n "checking for __builtin_powf""... $ac_c" 1>&6 -echo "configure:4365: checking for __builtin_powf" >&5 +echo "configure:4415: checking for __builtin_powf" >&5 cat > conftest.$ac_ext <<EOF -#line 4367 "configure" +#line 4417 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_powf(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:4374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_powf=yes else @@ -4388,16 +4438,16 @@ EOF fi echo $ac_n "checking for __builtin_powl""... $ac_c" 1>&6 -echo "configure:4392: checking for __builtin_powl" >&5 +echo "configure:4442: checking for __builtin_powl" >&5 cat > conftest.$ac_ext <<EOF -#line 4394 "configure" +#line 4444 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_powl(0.0, 0.0); ; return 0; } EOF -if { (eval echo configure:4401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_powl=yes else @@ -4415,16 +4465,16 @@ EOF fi echo $ac_n "checking for __builtin_sin""... $ac_c" 1>&6 -echo "configure:4419: checking for __builtin_sin" >&5 +echo "configure:4469: checking for __builtin_sin" >&5 cat > conftest.$ac_ext <<EOF -#line 4421 "configure" +#line 4471 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sin(0.0); ; return 0; } EOF -if { (eval echo configure:4428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sin=yes else @@ -4442,16 +4492,16 @@ EOF fi echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6 -echo "configure:4446: checking for __builtin_sinf" >&5 +echo "configure:4496: checking for __builtin_sinf" >&5 cat > conftest.$ac_ext <<EOF -#line 4448 "configure" +#line 4498 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinf(0.0); ; return 0; } EOF -if { (eval echo configure:4455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sinf=yes else @@ -4469,16 +4519,16 @@ EOF fi echo $ac_n "checking for __builtin_sinl""... $ac_c" 1>&6 -echo "configure:4473: checking for __builtin_sinl" >&5 +echo "configure:4523: checking for __builtin_sinl" >&5 cat > conftest.$ac_ext <<EOF -#line 4475 "configure" +#line 4525 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinl(0.0); ; return 0; } EOF -if { (eval echo configure:4482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sinl=yes else @@ -4496,16 +4546,16 @@ EOF fi echo $ac_n "checking for __builtin_sinh""... $ac_c" 1>&6 -echo "configure:4500: checking for __builtin_sinh" >&5 +echo "configure:4550: checking for __builtin_sinh" >&5 cat > conftest.$ac_ext <<EOF -#line 4502 "configure" +#line 4552 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinh(0.0); ; return 0; } EOF -if { (eval echo configure:4509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sinh=yes else @@ -4523,16 +4573,16 @@ EOF fi echo $ac_n "checking for __builtin_sinhf""... $ac_c" 1>&6 -echo "configure:4527: checking for __builtin_sinhf" >&5 +echo "configure:4577: checking for __builtin_sinhf" >&5 cat > conftest.$ac_ext <<EOF -#line 4529 "configure" +#line 4579 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinhf(0.0); ; return 0; } EOF -if { (eval echo configure:4536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sinhf=yes else @@ -4550,16 +4600,16 @@ EOF fi echo $ac_n "checking for __builtin_sinhl""... $ac_c" 1>&6 -echo "configure:4554: checking for __builtin_sinhl" >&5 +echo "configure:4604: checking for __builtin_sinhl" >&5 cat > conftest.$ac_ext <<EOF -#line 4556 "configure" +#line 4606 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinhl(0.0); ; return 0; } EOF -if { (eval echo configure:4563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sinhl=yes else @@ -4577,16 +4627,16 @@ EOF fi echo $ac_n "checking for __builtin_sqrt""... $ac_c" 1>&6 -echo "configure:4581: checking for __builtin_sqrt" >&5 +echo "configure:4631: checking for __builtin_sqrt" >&5 cat > conftest.$ac_ext <<EOF -#line 4583 "configure" +#line 4633 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fsqrt(0.0); ; return 0; } EOF -if { (eval echo configure:4590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sqrt=yes else @@ -4604,16 +4654,16 @@ EOF fi echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6 -echo "configure:4608: checking for __builtin_sqrtf" >&5 +echo "configure:4658: checking for __builtin_sqrtf" >&5 cat > conftest.$ac_ext <<EOF -#line 4610 "configure" +#line 4660 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrtf(0.0); ; return 0; } EOF -if { (eval echo configure:4617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sqrtf=yes else @@ -4631,16 +4681,16 @@ EOF fi echo $ac_n "checking for __builtin_sqrtl""... $ac_c" 1>&6 -echo "configure:4635: checking for __builtin_sqrtl" >&5 +echo "configure:4685: checking for __builtin_sqrtl" >&5 cat > conftest.$ac_ext <<EOF -#line 4637 "configure" +#line 4687 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrtl(0.0); ; return 0; } EOF -if { (eval echo configure:4644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sqrtl=yes else @@ -4658,16 +4708,16 @@ EOF fi echo $ac_n "checking for __builtin_tan""... $ac_c" 1>&6 -echo "configure:4662: checking for __builtin_tan" >&5 +echo "configure:4712: checking for __builtin_tan" >&5 cat > conftest.$ac_ext <<EOF -#line 4664 "configure" +#line 4714 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_tan(0.0); ; return 0; } EOF -if { (eval echo configure:4671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_tan=yes else @@ -4685,16 +4735,16 @@ EOF fi echo $ac_n "checking for __builtin_tanf""... $ac_c" 1>&6 -echo "configure:4689: checking for __builtin_tanf" >&5 +echo "configure:4739: checking for __builtin_tanf" >&5 cat > conftest.$ac_ext <<EOF -#line 4691 "configure" +#line 4741 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_tanf(0.0); ; return 0; } EOF -if { (eval echo configure:4698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_tanf=yes else @@ -4712,16 +4762,16 @@ EOF fi echo $ac_n "checking for __builtin_tanl""... $ac_c" 1>&6 -echo "configure:4716: checking for __builtin_tanl" >&5 +echo "configure:4766: checking for __builtin_tanl" >&5 cat > conftest.$ac_ext <<EOF -#line 4718 "configure" +#line 4768 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_tanl(0.0); ; return 0; } EOF -if { (eval echo configure:4725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_tanl=yes else @@ -4739,16 +4789,16 @@ EOF fi echo $ac_n "checking for __builtin_tanh""... $ac_c" 1>&6 -echo "configure:4743: checking for __builtin_tanh" >&5 +echo "configure:4793: checking for __builtin_tanh" >&5 cat > conftest.$ac_ext <<EOF -#line 4745 "configure" +#line 4795 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_tanh(0.0); ; return 0; } EOF -if { (eval echo configure:4752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_tanh=yes else @@ -4766,16 +4816,16 @@ EOF fi echo $ac_n "checking for __builtin_tanhf""... $ac_c" 1>&6 -echo "configure:4770: checking for __builtin_tanhf" >&5 +echo "configure:4820: checking for __builtin_tanhf" >&5 cat > conftest.$ac_ext <<EOF -#line 4772 "configure" +#line 4822 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_tanhf(0.0); ; return 0; } EOF -if { (eval echo configure:4779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_tanhf=yes else @@ -4793,16 +4843,16 @@ EOF fi echo $ac_n "checking for __builtin_tanhl""... $ac_c" 1>&6 -echo "configure:4797: checking for __builtin_tanhl" >&5 +echo "configure:4847: checking for __builtin_tanhl" >&5 cat > conftest.$ac_ext <<EOF -#line 4799 "configure" +#line 4849 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_tanhl(0.0); ; return 0; } EOF -if { (eval echo configure:4806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_tanhl=yes else @@ -4829,7 +4879,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4833: checking for sin in -lm" >&5 +echo "configure:4883: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4837,7 +4887,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 4841 "configure" +#line 4891 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4848,7 +4898,7 @@ int main() { sin() ; return 0; } EOF -if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4875,17 +4925,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4879: checking for $ac_hdr" >&5 +echo "configure:4929: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4884 "configure" +#line 4934 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4917,12 +4967,12 @@ done carg cargf nan hypot hypotf atan2f expf copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4921: checking for $ac_func" >&5 +echo "configure:4971: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4926 "configure" +#line 4976 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4945,7 +4995,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4974,12 +5024,12 @@ done USE_LONG_DOUBLE=no echo $ac_n "checking for copysignl""... $ac_c" 1>&6 -echo "configure:4978: checking for copysignl" >&5 +echo "configure:5028: checking for copysignl" >&5 if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4983 "configure" +#line 5033 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char copysignl(); below. */ @@ -5002,7 +5052,7 @@ copysignl(); ; return 0; } EOF -if { (eval echo configure:5006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_copysignl=yes" else @@ -5021,12 +5071,12 @@ if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5025: checking for $ac_func" >&5 +echo "configure:5075: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5030 "configure" +#line 5080 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5049,7 +5099,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5084,12 +5134,12 @@ fi for ac_func in cosf fabsf sinf sqrtf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5088: checking for $ac_func" >&5 +echo "configure:5138: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5093 "configure" +#line 5143 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5112,7 +5162,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5146,12 +5196,12 @@ done sincosl finite finitef finitel fqfinite fpclass qfpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5150: checking for $ac_func" >&5 +echo "configure:5200: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5155 "configure" +#line 5205 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5174,7 +5224,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5213,12 +5263,12 @@ done _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5217: checking for $ac_func" >&5 +echo "configure:5267: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5222 "configure" +#line 5272 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5241,7 +5291,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5272,17 +5322,17 @@ LIBS="$save_LIBS" ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:5276: checking for wchar.h" >&5 +echo "configure:5326: checking for wchar.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5281 "configure" +#line 5331 "configure" #include "confdefs.h" #include <wchar.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5306,17 +5356,17 @@ fi ac_safe=`echo "wctype.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wctype.h""... $ac_c" 1>&6 -echo "configure:5310: checking for wctype.h" >&5 +echo "configure:5360: checking for wctype.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5315 "configure" +#line 5365 "configure" #include "confdefs.h" #include <wctype.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5342,16 +5392,16 @@ fi if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes; then echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:5346: checking for mbstate_t" >&5 +echo "configure:5396: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 5348 "configure" +#line 5398 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:5355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_native_mbstatet=yes else @@ -5370,16 +5420,16 @@ EOF fi echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:5374: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:5424: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 5376 "configure" +#line 5426 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:5383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -5392,9 +5442,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:5396: checking for WEOF" >&5 +echo "configure:5446: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 5398 "configure" +#line 5448 "configure" #include "confdefs.h" #include <wchar.h> @@ -5403,7 +5453,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:5407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -5418,12 +5468,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5422: checking for $ac_func" >&5 +echo "configure:5472: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5427 "configure" +#line 5477 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5446,7 +5496,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5473,7 +5523,7 @@ done echo $ac_n "checking for ISO C9X wchar_t support""... $ac_c" 1>&6 -echo "configure:5477: checking for ISO C9X wchar_t support" >&5 +echo "configure:5527: checking for ISO C9X wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then ac_isoC9X_wchar_t=yes else @@ -5483,17 +5533,17 @@ echo "configure:5477: checking for ISO C9X wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:5487: checking for iconv.h" >&5 +echo "configure:5537: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5492 "configure" +#line 5542 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5518,12 +5568,12 @@ fi for ac_func in iconv_open iconv_close iconv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5522: checking for $ac_func" >&5 +echo "configure:5572: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5527 "configure" +#line 5577 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5546,7 +5596,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5573,7 +5623,7 @@ done echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:5577: checking for XPG2 wchar_t support" >&5 +echo "configure:5627: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_XPG2funcs" = xyes; then ac_XPG2_wchar_t=yes else @@ -5582,7 +5632,7 @@ echo "configure:5577: checking for XPG2 wchar_t support" >&5 echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:5586: checking for enabled wchar_t specializations" >&5 +echo "configure:5636: checking for enabled wchar_t specializations" >&5 if test x"$ac_isoC9X_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then libinst_wstring_la="libinst-wstring.la" cat >> confdefs.h <<\EOF @@ -5607,17 +5657,17 @@ EOF ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ctype.h""... $ac_c" 1>&6 -echo "configure:5611: checking for ctype.h" >&5 +echo "configure:5661: checking for ctype.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5616 "configure" +#line 5666 "configure" #include "confdefs.h" #include <ctype.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5638,9 +5688,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ctype_default=yes echo $ac_n "checking <ctype> for gnu-linux ""... $ac_c" 1>&6 -echo "configure:5642: checking <ctype> for gnu-linux " >&5 +echo "configure:5692: checking <ctype> for gnu-linux " >&5 cat > conftest.$ac_ext <<EOF -#line 5644 "configure" +#line 5694 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -5651,7 +5701,7 @@ int + __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];} ; return 0; } EOF -if { (eval echo configure:5655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_linux=yes @@ -5670,9 +5720,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for freebsd 4.0 ""... $ac_c" 1>&6 -echo "configure:5674: checking <ctype> for freebsd 4.0 " >&5 +echo "configure:5724: checking <ctype> for freebsd 4.0 " >&5 cat > conftest.$ac_ext <<EOF -#line 5676 "configure" +#line 5726 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -5682,7 +5732,7 @@ int + _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;} ; return 0; } EOF -if { (eval echo configure:5686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_bsd=yes @@ -5702,9 +5752,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for freebsd 3.4 ""... $ac_c" 1>&6 -echo "configure:5706: checking <ctype> for freebsd 3.4 " >&5 +echo "configure:5756: checking <ctype> for freebsd 3.4 " >&5 cat > conftest.$ac_ext <<EOF -#line 5708 "configure" +#line 5758 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -5714,7 +5764,7 @@ int + _D + _P + _X + _G + __istype (a, 0);} ; return 0; } EOF -if { (eval echo configure:5718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_freebsd34=yes @@ -5734,9 +5784,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for solaris 2.6,7,8 ""... $ac_c" 1>&6 -echo "configure:5738: checking <ctype> for solaris 2.6,7,8 " >&5 +echo "configure:5788: checking <ctype> for solaris 2.6,7,8 " >&5 cat > conftest.$ac_ext <<EOF -#line 5740 "configure" +#line 5790 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -5747,7 +5797,7 @@ int + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];} ; return 0; } EOF -if { (eval echo configure:5751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris=yes @@ -5762,7 +5812,7 @@ rm -f conftest* if test $ctype_solaris = "yes"; then echo $ac_n "checking for version""... $ac_c" 1>&6 -echo "configure:5766: checking for version" >&5 +echo "configure:5816: checking for version" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -5771,14 +5821,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 5775 "configure" +#line 5825 "configure" #include "confdefs.h" #include <ctype.h> int main() { typedef long* __to_type; __to_type const& _M_toupper = __trans_upper; ; return 0; } EOF -if { (eval echo configure:5782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris26=yes @@ -5810,9 +5860,9 @@ cross_compiling=$ac_cv_prog_cc_cross if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for solaris 2.5.1 ""... $ac_c" 1>&6 -echo "configure:5814: checking <ctype> for solaris 2.5.1 " >&5 +echo "configure:5864: checking <ctype> for solaris 2.5.1 " >&5 cat > conftest.$ac_ext <<EOF -#line 5816 "configure" +#line 5866 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -5822,7 +5872,7 @@ int + __ctype[a];} ; return 0; } EOF -if { (eval echo configure:5826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris25=yes @@ -5842,9 +5892,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6 -echo "configure:5846: checking <ctype> for aix " >&5 +echo "configure:5896: checking <ctype> for aix " >&5 cat > conftest.$ac_ext <<EOF -#line 5848 "configure" +#line 5898 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -5855,7 +5905,7 @@ int + _VALC('a') + _IS('c', 0);} ; return 0; } EOF -if { (eval echo configure:5859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_aix=yes @@ -5875,9 +5925,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6 -echo "configure:5879: checking <ctype> for newlib " >&5 +echo "configure:5929: checking <ctype> for newlib " >&5 cat > conftest.$ac_ext <<EOF -#line 5881 "configure" +#line 5931 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -5887,7 +5937,7 @@ int + _ctype_[a];} ; return 0; } EOF -if { (eval echo configure:5891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_newlib=yes @@ -5921,17 +5971,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5925: checking for $ac_hdr" >&5 +echo "configure:5975: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5930 "configure" +#line 5980 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5960,12 +6010,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5964: checking for $ac_func" >&5 +echo "configure:6014: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5969 "configure" +#line 6019 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5988,7 +6038,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6013,7 +6063,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:6017: checking for working mmap" >&5 +echo "configure:6067: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6021,7 +6071,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 6025 "configure" +#line 6075 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -6161,7 +6211,7 @@ main() } EOF -if { (eval echo configure:6165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -6224,19 +6274,19 @@ fi if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:6228: checking for LC_MESSAGES" >&5 +echo "configure:6278: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6233 "configure" +#line 6283 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:6240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_val_LC_MESSAGES=yes else @@ -6461,13 +6511,10 @@ s%@GLIBCPP_CFLAGS@%$GLIBCPP_CFLAGS%g s%@GLIBCPP_CXXFLAGS@%$GLIBCPP_CXXFLAGS%g s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g -s%@CXXCPP@%$CXXCPP%g -s%@WERROR@%$WERROR%g -s%@FMTFLAGS@%$FMTFLAGS%g -s%@cpu_include_dir@%$cpu_include_dir%g -s%@CPUFLAGS@%$CPUFLAGS%g -s%@DEBUGFLAGS@%$DEBUGFLAGS%g s%@CPP@%$CPP%g +s%@cpu_include_dir@%$cpu_include_dir%g +s%@CPU_FLAGS@%$CPU_FLAGS%g +s%@DEBUG_FLAGS@%$DEBUG_FLAGS%g s%@BUILD_LIBIO_INCLUDE@%$BUILD_LIBIO_INCLUDE%g s%@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@%$GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE%g s%@GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE@%$GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE%g @@ -6486,6 +6533,10 @@ s%@THREADOBJS@%$THREADOBJS%g s%@THREADSPEC@%$THREADSPEC%g s%@EXTRA_CXX_FLAGS@%$EXTRA_CXX_FLAGS%g s%@ctype_include_dir@%$ctype_include_dir%g +s%@WERROR@%$WERROR%g +s%@WFMT_FLAGS@%$WFMT_FLAGS%g +s%@SECTION_FLAGS@%$SECTION_FLAGS%g +s%@SECTION_LDFLAGS@%$SECTION_LDFLAGS%g s%@LIBMATHOBJS@%$LIBMATHOBJS%g s%@USE_LONG_DOUBLE@%$USE_LONG_DOUBLE%g s%@libinst_wstring_la@%$libinst_wstring_la%g diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in index b5d9b2d3c073..d05a73008ad1 100644 --- a/libstdc++-v3/configure.in +++ b/libstdc++-v3/configure.in @@ -106,6 +106,8 @@ else AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \ machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h]) + GLIBCPP_CHECK_COMPILER_FEATURES + GLIBCPP_CHECK_LINKER_FEATURES GLIBCPP_CHECK_COMPLEX_SUPPORT GLIBCPP_CHECK_COMPLEX_FLOAT_SUPPORT GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index 1f524f97584e..94d45bff60df 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -68,18 +68,17 @@ AS = @AS@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ CC = @CC@ CPP = @CPP@ -CPUFLAGS = @CPUFLAGS@ +CPU_FLAGS = @CPU_FLAGS@ CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSTDIO_CC = @CSTDIO_CC@ CSTDIO_H = @CSTDIO_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ -DEBUGFLAGS = @DEBUGFLAGS@ +DEBUG_FLAGS = @DEBUG_FLAGS@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@ -FMTFLAGS = @FMTFLAGS@ GCC_OBJDIR = @GCC_OBJDIR@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ @@ -92,6 +91,8 @@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SECTION_FLAGS = @SECTION_FLAGS@ +SECTION_LDFLAGS = @SECTION_LDFLAGS@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ @@ -100,6 +101,7 @@ THREADSPEC = @THREADSPEC@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ VERSION = @VERSION@ WERROR = @WERROR@ +WFMT_FLAGS = @WFMT_FLAGS@ cpu_include_dir = @cpu_include_dir@ ctype_include_dir = @ctype_include_dir@ glibcpp_basedir = @glibcpp_basedir@ diff --git a/libstdc++-v3/math/Makefile.in b/libstdc++-v3/math/Makefile.in index c418c71471ec..12899aa0ddb2 100644 --- a/libstdc++-v3/math/Makefile.in +++ b/libstdc++-v3/math/Makefile.in @@ -68,18 +68,17 @@ AS = @AS@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ CC = @CC@ CPP = @CPP@ -CPUFLAGS = @CPUFLAGS@ +CPU_FLAGS = @CPU_FLAGS@ CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSTDIO_CC = @CSTDIO_CC@ CSTDIO_H = @CSTDIO_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ -DEBUGFLAGS = @DEBUGFLAGS@ +DEBUG_FLAGS = @DEBUG_FLAGS@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@ -FMTFLAGS = @FMTFLAGS@ GCC_OBJDIR = @GCC_OBJDIR@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ @@ -92,6 +91,8 @@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SECTION_FLAGS = @SECTION_FLAGS@ +SECTION_LDFLAGS = @SECTION_LDFLAGS@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ @@ -100,6 +101,7 @@ THREADSPEC = @THREADSPEC@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ VERSION = @VERSION@ WERROR = @WERROR@ +WFMT_FLAGS = @WFMT_FLAGS@ cpu_include_dir = @cpu_include_dir@ ctype_include_dir = @ctype_include_dir@ glibcpp_basedir = @glibcpp_basedir@ diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index a597e2b8a18b..14834bf99f1e 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -69,7 +69,7 @@ fi # gcc compiler flags #CXX_FLAG="-fsquangle -fhonor-std -fnew-exceptions -g -O2 -DDEBUG_ASSERT " #CXX_FLAG="-g -O2 -DDEBUG_ASSERT " -CXX_FLAG="-g -DDEBUG_ASSERT " +CXX_FLAG="-g -DDEBUG_ASSERT @SECTION_FLAGS@ @SECTION_LDFLAGS@" # a specific flag(s) to force the use of shared libraries, if any SH_FLAG="" diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 672965411155..1435072a83ce 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -38,25 +38,23 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la # Using these options is probably a good idea for thrill-seekers. Just -# uncomment the lines below and make, everything else is ready to go... -# OPTIMIZE_CXXFLAGS = \ -# -O3 -fstrict-aliasing \ -# -fdata-sections -ffunction-sections -fvtable-gc -Wl,--gc-sections +# uncomment the lines below and make, everything else is ready to go... +# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc # These bits are all figured out from configure. Look in acinclude.m4 # or configure.in to see how they are set. +# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. AC_CXXFLAGS = \ - @WERROR@ @FMTFLAGS@ @CSHADOWFLAGS@ @CPUFLAGS@ \ - @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@ + @WERROR@ @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \ + @SECTION_FLAGS@ @SECTION_LDFLAGS@ @DEBUG_FLAGS@ # Need to manually set this option because AC_CXXFLAGS has to be at -# the end of the compile line so that -O2 can be over-riden as the +# the end of the compile line so that -O2 can be overridden as the # occasion call for it. (ie, --enable-debug) AM_CXXFLAGS = \ - $(FORMAT_CXXFLAGS) \ - -fno-implicit-templates \ + -fno-implicit-templates $(OPTIMIZE_CXXFLAGS) \ -Wall -Wno-format -W -Wwrite-strings -Winline \ - $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) + $(AC_CXXFLAGS) # Passed down for cross compilers, canadian crosses. @@ -79,8 +77,8 @@ INCLUDES = \ # Need to explicitly set this so that AM_CXXFLAGS is last. (That way, # things like -O2 passed down from the toplevel can be overridden by # --enable-debug.) -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) +CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) $(AM_CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) @@ -195,63 +193,25 @@ sources = \ complex.cc complexf.cc complexl.cc complex_io.cc \ stdexcept.cc ios.cc stdstreams.cc strstream.cc \ locale.cc localename.cc \ - locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc - -string_sources = \ - stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \ - stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \ - stringCTORPAL.cc stringCTORPP.cc stringCTORII.cc \ - stringMUTATE.cc stringRESERVE.cc \ - stringSWAP.cc stringSLOP.cc \ - stringRESIZE.cc stringAPPCOPY.cc stringAPPCPR.cc stringAPPPR.cc \ - stringAPPDUP.cc stringAPPII.cc stringASSCP.cc stringASSII.cc \ - stringINSII.cc stringREPRR.cc stringREPIIDUP.cc stringREPII.cc \ - stringREPIII.cc stringREP4I.cc stringREPIIPP.cc stringREPIIPP2.cc \ - stringCOPY.cc stringCONII.cc stringCONIIF.cc stringCONPPF.cc \ - stringCONPPF2.cc stringCONSC.cc \ - stringFIND.cc stringFINDC.cc stringRFIND.cc \ - stringRFINDC.cc stringFFO.cc stringFLO.cc stringFFNO.cc \ - stringFLNO.cc stringFLNOC.cc stringCOMPARE.cc stringCOMPARE2.cc \ - stringCOMPAREP.cc stringCOMPAREP2.cc stringADDPS.cc stringADDCS.cc \ - stringEXTRACT.cc stringINSERT.cc stringGETLINE.cc stringSCOPY.cc \ - stringEQ.cc + locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc wstring_sources = \ - wstringMAIN.cc wstringCTORNC.cc wstringCTORAL.cc \ - wstringCTORCPR.cc wstringCTORCPRAL.cc wstringCTORPRAL.cc \ - wstringCTORPAL.cc wstringCTORPP.cc \ - wstringCTORII.cc \ - wstringMUTATE.cc wstringRESERVE.cc \ - wstringSWAP.cc wstringSLOP.cc \ - wstringRESIZE.cc wstringAPPCOPY.cc wstringAPPCPR.cc wstringAPPPR.cc \ - wstringAPPDUP.cc wstringAPPII.cc wstringASSCP.cc wstringASSII.cc \ - wstringINSII.cc wstringREPRR.cc wstringREPIIDUP.cc wstringREPII.cc \ - wstringREPIII.cc wstringREP4I.cc wstringREPIIPP.cc wstringREPIIPP2.cc \ - wstringCOPY.cc wstringCONII.cc wstringCONIIF.cc wstringCONPPF.cc \ - wstringCONPPF2.cc wstringCONSC.cc \ - wstringFIND.cc wstringFINDC.cc wstringRFIND.cc \ - wstringRFINDC.cc wstringFFO.cc wstringFLO.cc wstringFFNO.cc \ - wstringFLNO.cc wstringFLNOC.cc wstringCOMPARE.cc wstringCOMPARE2.cc \ - wstringCOMPAREP.cc wstringCOMPAREP2.cc wstringADDPS.cc \ - wstringADDCS.cc wstringEXTRACT.cc wstringINSERT.cc wstringGETLINE.cc \ - wstringSCOPY.cc wstringEQ.cc + wstring-inst.cc VPATH += $(top_srcdir) $(top_srcdir)/std $(top_srcdir)/src VPATH += $(top_srcdir)/@ctype_include_dir@ # Actual sources for the distro, but don't build these. -EXTRA_sources = string-inst.cc +#EXTRA_sources = string-inst.cc libstdc___la_SOURCES = $(sources) -libinst_string_la_SOURCES = $(string_sources) - libinst_wstring_la_SOURCES = $(wstring_sources) libstdc___la_LIBADD = \ ../math/libmath.la ../libio/libio.la \ - libinst-string.la @libinst_wstring_la@ + @libinst_wstring_la@ libstdc___la_LDFLAGS = -version-info 3:0:0 -lm @@ -333,235 +293,9 @@ locale-inst.o: locale-inst.cc locale-inst.lo: locale-inst.cc $(LTCXXCOMPILE) -fimplicit-templates -c $< -stringMAIN.lo \ -stringCTORNC.lo \ -stringCTORAL.lo \ -stringCTORCPR.lo \ -stringCTORCPRAL.lo \ -stringCTORPRAL.lo \ -stringCTORPAL.lo \ -stringCTORPP.lo \ -stringCTORII.lo \ -stringMUTATE.lo \ -stringRESERVE.lo \ -stringSWAP.lo \ -stringSLOP.lo \ -stringRESIZE.lo \ -stringAPPCOPY.lo \ -stringAPPCPR.lo \ -stringAPPPR.lo \ -stringAPPDUP.lo \ -stringAPPII.lo \ -stringASSCP.lo \ -stringASSII.lo \ -stringINSII.lo \ -stringREPRR.lo \ -stringREPIIDUP.lo \ -stringREPII.lo \ -stringREPIII.lo \ -stringREP4I.lo \ -stringREPIIPP.lo \ -stringREPIIPP2.lo \ -stringCOPY.lo \ -stringCONII.lo \ -stringCONIIF.lo \ -stringCONPPF.lo \ -stringCONPPF2.lo \ -stringCONSC.lo \ -stringFIND.lo \ -stringFINDC.lo \ -stringRFIND.lo \ -stringRFINDC.lo \ -stringFFO.lo \ -stringFLO.lo \ -stringFFNO.lo \ -stringFLNO.lo \ -stringFLNOC.lo \ -stringCOMPARE.lo \ -stringCOMPARE2.lo \ -stringCOMPAREP.lo \ -stringCOMPAREP2.lo \ -stringADDPS.lo \ -stringADDCS.lo \ -stringEXTRACT.lo \ -stringINSERT.lo \ -stringGETLINE.lo \ -stringSCOPY.lo \ -stringEQ.lo : string-inst.cc - $(LTCXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@ - -wstringMAIN.lo \ -wstringCTORNC.lo \ -wstringCTORAL.lo \ -wstringCTORCPR.lo \ -wstringCTORCPRAL.lo \ -wstringCTORPRAL.lo \ -wstringCTORPAL.lo \ -wstringCTORPP.lo \ -wstringCTORII.lo \ -wstringMUTATE.lo \ -wstringRESERVE.lo \ -wstringSWAP.lo \ -wstringSLOP.lo \ -wstringRESIZE.lo \ -wstringAPPCOPY.lo \ -wstringAPPCPR.lo \ -wstringAPPPR.lo \ -wstringAPPDUP.lo \ -wstringAPPII.lo \ -wstringASSCP.lo \ -wstringASSII.lo \ -wstringINSII.lo \ -wstringREPRR.lo \ -wstringREPIIDUP.lo \ -wstringREPII.lo \ -wstringREPIII.lo \ -wstringREP4I.lo \ -wstringREPIIPP.lo \ -wstringREPIIPP2.lo \ -wstringCOPY.lo \ -wstringCONII.lo \ -wstringCONIIF.lo \ -wstringCONPPF.lo \ -wstringCONPPF2.lo \ -wstringCONSC.lo \ -wstringFIND.lo \ -wstringFINDC.lo \ -wstringRFIND.lo \ -wstringRFINDC.lo \ -wstringFFO.lo \ -wstringFLO.lo \ -wstringFFNO.lo \ -wstringFLNO.lo \ -wstringFLNOC.lo \ -wstringCOMPARE.lo \ -wstringCOMPARE2.lo \ -wstringCOMPAREP.lo \ -wstringCOMPAREP2.lo \ -wstringADDPS.lo \ -wstringADDCS.lo \ -wstringEXTRACT.lo \ -wstringINSERT.lo \ -wstringGETLINE.lo \ -wstringSCOPY.lo \ -wstringEQ.lo : string-inst.cc - $(LTCXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@ - -stringMAIN.o \ -stringCTORNC.o \ -stringCTORAL.o \ -stringCTORCPR.o \ -stringCTORCPRAL.o \ -stringCTORPRAL.o \ -stringCTORPAL.o \ -stringCTORPP.o \ -stringCTORII.o \ -stringMUTATE.o \ -stringRESERVE.o \ -stringSWAP.o \ -stringSLOP.o \ -stringRESIZE.o \ -stringAPPCOPY.o \ -stringAPPCPR.o \ -stringAPPPR.o \ -stringAPPDUP.o \ -stringAPPII.o \ -stringASSCP.o \ -stringASSII.o \ -stringINSII.o \ -stringREPRR.o \ -stringREPIIDUP.o \ -stringREPII.o \ -stringREPIII.o \ -stringREP4I.o \ -stringREPIIPP.o \ -stringREPIIPP2.o \ -stringCOPY.o \ -stringCONII.o \ -stringCONIIF.o \ -stringCONPPF.o \ -stringCONPPF2.o \ -stringCONSC.o \ -stringFIND.o \ -stringFINDC.o \ -stringRFIND.o \ -stringRFINDC.o \ -stringFFO.o \ -stringFLO.o \ -stringFFNO.o \ -stringFLNO.o \ -stringFLNOC.o \ -stringCOMPARE.o \ -stringCOMPARE2.o \ -stringCOMPAREP.o \ -stringCOMPAREP2.o \ -stringADDPS.o \ -stringADDCS.o \ -stringEXTRACT.o \ -stringINSERT.o \ -stringGETLINE.o \ -stringSCOPY.o \ -stringEQ.o : string-inst.cc - $(CXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@ - -wstringMAIN.o \ -wstringCTORNC.o \ -wstringCTORAL.o \ -wstringCTORCPR.o \ -wstringCTORCPRAL.o \ -wstringCTORPRAL.o \ -wstringCTORPAL.o \ -wstringCTORPP.o \ -wstringCTORII.o \ -wstringMUTATE.o \ -wstringRESERVE.o \ -wstringSWAP.o \ -wstringSLOP.o \ -wstringRESIZE.o \ -wstringAPPCOPY.o \ -wstringAPPCPR.o \ -wstringAPPPR.o \ -wstringAPPDUP.o \ -wstringAPPII.o \ -wstringASSCP.o \ -wstringASSII.o \ -wstringINSII.o \ -wstringREPRR.o \ -wstringREPIIDUP.o \ -wstringREPII.o \ -wstringREPIII.o \ -wstringREP4I.o \ -wstringREPIIPP.o \ -wstringREPIIPP2.o \ -wstringCOPY.o \ -wstringCONII.o \ -wstringCONIIF.o \ -wstringCONPPF.o \ -wstringCONPPF2.o \ -wstringCONSC.o \ -wstringFIND.o \ -wstringFINDC.o \ -wstringRFIND.o \ -wstringRFINDC.o \ -wstringFFO.o \ -wstringFLO.o \ -wstringFFNO.o \ -wstringFLNO.o \ -wstringFLNOC.o \ -wstringCOMPARE.o \ -wstringCOMPARE2.o \ -wstringCOMPAREP.o \ -wstringCOMPAREP2.o \ -wstringADDPS.o \ -wstringADDCS.o \ -wstringEXTRACT.o \ -wstringINSERT.o \ -wstringGETLINE.o \ -wstringSCOPY.o \ -wstringEQ.o : string-inst.cc - $(CXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@ +# We have to instantiate wstring bits too. . . +wstring-inst.o: string-inst.cc + $(CXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ +wstring-inst.lo: string-inst.cc + $(LTCXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 929a153094d8..41825ef76fc8 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -67,17 +67,16 @@ AS = @AS@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ CC = @CC@ CPP = @CPP@ -CPUFLAGS = @CPUFLAGS@ +CPU_FLAGS = @CPU_FLAGS@ CSHADOWFLAGS = @CSHADOWFLAGS@ CSTDIO_CC = @CSTDIO_CC@ CSTDIO_H = @CSTDIO_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ -DEBUGFLAGS = @DEBUGFLAGS@ +DEBUG_FLAGS = @DEBUG_FLAGS@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@ -FMTFLAGS = @FMTFLAGS@ GCC_OBJDIR = @GCC_OBJDIR@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ @@ -90,6 +89,8 @@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SECTION_FLAGS = @SECTION_FLAGS@ +SECTION_LDFLAGS = @SECTION_LDFLAGS@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ @@ -98,6 +99,7 @@ THREADSPEC = @THREADSPEC@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ VERSION = @VERSION@ WERROR = @WERROR@ +WFMT_FLAGS = @WFMT_FLAGS@ cpu_include_dir = @cpu_include_dir@ ctype_include_dir = @ctype_include_dir@ glibcpp_basedir = @glibcpp_basedir@ @@ -116,26 +118,24 @@ toolexeclib_LTLIBRARIES = libstdc++.la EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la # Using these options is probably a good idea for thrill-seekers. Just -# uncomment the lines below and make, everything else is ready to go... -# OPTIMIZE_CXXFLAGS = \ -# -O3 -fstrict-aliasing \ -# -fdata-sections -ffunction-sections -fvtable-gc -Wl,--gc-sections +# uncomment the lines below and make, everything else is ready to go... +# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc # These bits are all figured out from configure. Look in acinclude.m4 # or configure.in to see how they are set. +# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. AC_CXXFLAGS = \ - @WERROR@ @FMTFLAGS@ @CSHADOWFLAGS@ @CPUFLAGS@ \ - @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@ + @WERROR@ @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \ + @SECTION_FLAGS@ @SECTION_LDFLAGS@ @DEBUG_FLAGS@ # Need to manually set this option because AC_CXXFLAGS has to be at -# the end of the compile line so that -O2 can be over-riden as the +# the end of the compile line so that -O2 can be overridden as the # occasion call for it. (ie, --enable-debug) AM_CXXFLAGS = \ - $(FORMAT_CXXFLAGS) \ - -fno-implicit-templates \ + -fno-implicit-templates $(OPTIMIZE_CXXFLAGS) \ -Wall -Wno-format -W -Wwrite-strings -Winline \ - $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) + $(AC_CXXFLAGS) # Passed down for cross compilers, canadian crosses. @@ -159,8 +159,8 @@ INCLUDES = \ # Need to explicitly set this so that AM_CXXFLAGS is last. (That way, # things like -O2 passed down from the toplevel can be overridden by # --enable-debug.) -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) +CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) $(AM_CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \ @@ -276,63 +276,24 @@ sources = \ complex.cc complexf.cc complexl.cc complex_io.cc \ stdexcept.cc ios.cc stdstreams.cc strstream.cc \ locale.cc localename.cc \ - locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc - - -string_sources = \ - stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \ - stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \ - stringCTORPAL.cc stringCTORPP.cc stringCTORII.cc \ - stringMUTATE.cc stringRESERVE.cc \ - stringSWAP.cc stringSLOP.cc \ - stringRESIZE.cc stringAPPCOPY.cc stringAPPCPR.cc stringAPPPR.cc \ - stringAPPDUP.cc stringAPPII.cc stringASSCP.cc stringASSII.cc \ - stringINSII.cc stringREPRR.cc stringREPIIDUP.cc stringREPII.cc \ - stringREPIII.cc stringREP4I.cc stringREPIIPP.cc stringREPIIPP2.cc \ - stringCOPY.cc stringCONII.cc stringCONIIF.cc stringCONPPF.cc \ - stringCONPPF2.cc stringCONSC.cc \ - stringFIND.cc stringFINDC.cc stringRFIND.cc \ - stringRFINDC.cc stringFFO.cc stringFLO.cc stringFFNO.cc \ - stringFLNO.cc stringFLNOC.cc stringCOMPARE.cc stringCOMPARE2.cc \ - stringCOMPAREP.cc stringCOMPAREP2.cc stringADDPS.cc stringADDCS.cc \ - stringEXTRACT.cc stringINSERT.cc stringGETLINE.cc stringSCOPY.cc \ - stringEQ.cc + locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc wstring_sources = \ - wstringMAIN.cc wstringCTORNC.cc wstringCTORAL.cc \ - wstringCTORCPR.cc wstringCTORCPRAL.cc wstringCTORPRAL.cc \ - wstringCTORPAL.cc wstringCTORPP.cc \ - wstringCTORII.cc \ - wstringMUTATE.cc wstringRESERVE.cc \ - wstringSWAP.cc wstringSLOP.cc \ - wstringRESIZE.cc wstringAPPCOPY.cc wstringAPPCPR.cc wstringAPPPR.cc \ - wstringAPPDUP.cc wstringAPPII.cc wstringASSCP.cc wstringASSII.cc \ - wstringINSII.cc wstringREPRR.cc wstringREPIIDUP.cc wstringREPII.cc \ - wstringREPIII.cc wstringREP4I.cc wstringREPIIPP.cc wstringREPIIPP2.cc \ - wstringCOPY.cc wstringCONII.cc wstringCONIIF.cc wstringCONPPF.cc \ - wstringCONPPF2.cc wstringCONSC.cc \ - wstringFIND.cc wstringFINDC.cc wstringRFIND.cc \ - wstringRFINDC.cc wstringFFO.cc wstringFLO.cc wstringFFNO.cc \ - wstringFLNO.cc wstringFLNOC.cc wstringCOMPARE.cc wstringCOMPARE2.cc \ - wstringCOMPAREP.cc wstringCOMPAREP2.cc wstringADDPS.cc \ - wstringADDCS.cc wstringEXTRACT.cc wstringINSERT.cc wstringGETLINE.cc \ - wstringSCOPY.cc wstringEQ.cc + wstring-inst.cc VPATH = $(top_srcdir) $(top_srcdir)/std $(top_srcdir)/src $(top_srcdir)/@ctype_include_dir@ # Actual sources for the distro, but don't build these. -EXTRA_sources = string-inst.cc +#EXTRA_sources = string-inst.cc libstdc___la_SOURCES = $(sources) -libinst_string_la_SOURCES = $(string_sources) - libinst_wstring_la_SOURCES = $(wstring_sources) libstdc___la_LIBADD = \ ../math/libmath.la ../libio/libio.la \ - libinst-string.la @libinst_wstring_la@ + @libinst_wstring_la@ libstdc___la_LDFLAGS = -version-info 3:0:0 -lm @@ -358,43 +319,22 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libinst_string_la_LDFLAGS = libinst_string_la_LIBADD = -libinst_string_la_OBJECTS = stringMAIN.lo stringCTORNC.lo \ -stringCTORAL.lo stringCTORCPR.lo stringCTORCPRAL.lo stringCTORPRAL.lo \ -stringCTORPAL.lo stringCTORPP.lo stringCTORII.lo stringMUTATE.lo \ -stringRESERVE.lo stringSWAP.lo stringSLOP.lo stringRESIZE.lo \ -stringAPPCOPY.lo stringAPPCPR.lo stringAPPPR.lo stringAPPDUP.lo \ -stringAPPII.lo stringASSCP.lo stringASSII.lo stringINSII.lo \ -stringREPRR.lo stringREPIIDUP.lo stringREPII.lo stringREPIII.lo \ -stringREP4I.lo stringREPIIPP.lo stringREPIIPP2.lo stringCOPY.lo \ -stringCONII.lo stringCONIIF.lo stringCONPPF.lo stringCONPPF2.lo \ -stringCONSC.lo stringFIND.lo stringFINDC.lo stringRFIND.lo \ -stringRFINDC.lo stringFFO.lo stringFLO.lo stringFFNO.lo stringFLNO.lo \ -stringFLNOC.lo stringCOMPARE.lo stringCOMPARE2.lo stringCOMPAREP.lo \ -stringCOMPAREP2.lo stringADDPS.lo stringADDCS.lo stringEXTRACT.lo \ -stringINSERT.lo stringGETLINE.lo stringSCOPY.lo stringEQ.lo +libinst_string_la_SOURCES = libinst-string.la.c +libinst_string_la_OBJECTS = libinst-string.la.lo libinst_wstring_la_LDFLAGS = libinst_wstring_la_LIBADD = -libinst_wstring_la_OBJECTS = wstringMAIN.lo wstringCTORNC.lo \ -wstringCTORAL.lo wstringCTORCPR.lo wstringCTORCPRAL.lo \ -wstringCTORPRAL.lo wstringCTORPAL.lo wstringCTORPP.lo wstringCTORII.lo \ -wstringMUTATE.lo wstringRESERVE.lo wstringSWAP.lo wstringSLOP.lo \ -wstringRESIZE.lo wstringAPPCOPY.lo wstringAPPCPR.lo wstringAPPPR.lo \ -wstringAPPDUP.lo wstringAPPII.lo wstringASSCP.lo wstringASSII.lo \ -wstringINSII.lo wstringREPRR.lo wstringREPIIDUP.lo wstringREPII.lo \ -wstringREPIII.lo wstringREP4I.lo wstringREPIIPP.lo wstringREPIIPP2.lo \ -wstringCOPY.lo wstringCONII.lo wstringCONIIF.lo wstringCONPPF.lo \ -wstringCONPPF2.lo wstringCONSC.lo wstringFIND.lo wstringFINDC.lo \ -wstringRFIND.lo wstringRFINDC.lo wstringFFO.lo wstringFLO.lo \ -wstringFFNO.lo wstringFLNO.lo wstringFLNOC.lo wstringCOMPARE.lo \ -wstringCOMPARE2.lo wstringCOMPAREP.lo wstringCOMPAREP2.lo \ -wstringADDPS.lo wstringADDCS.lo wstringEXTRACT.lo wstringINSERT.lo \ -wstringGETLINE.lo wstringSCOPY.lo wstringEQ.lo +libinst_wstring_la_OBJECTS = wstring-inst.lo libstdc___la_OBJECTS = limitsMEMBERS.lo c++io.lo cmath.lo complex.lo \ complexf.lo complexl.lo complex_io.lo stdexcept.lo ios.lo stdstreams.lo \ strstream.lo locale.lo localename.lo locale-inst.lo stl-inst.lo \ -misc-inst.lo valarray-inst.lo +misc-inst.lo valarray-inst.lo string-inst.lo CXXFLAGS = @CXXFLAGS@ CXXLD = $(CXX) +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in @@ -402,8 +342,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best -SOURCES = $(libinst_string_la_SOURCES) $(libinst_wstring_la_SOURCES) $(libstdc___la_SOURCES) -OBJECTS = $(libinst_string_la_OBJECTS) $(libinst_wstring_la_OBJECTS) $(libstdc___la_OBJECTS) +SOURCES = libinst-string.la.c $(libinst_wstring_la_SOURCES) $(libstdc___la_SOURCES) +OBJECTS = libinst-string.la.lo $(libinst_wstring_la_OBJECTS) $(libstdc___la_OBJECTS) all: all-redirect .SUFFIXES: @@ -480,7 +420,7 @@ distclean-libtool: maintainer-clean-libtool: libinst-string.la: $(libinst_string_la_OBJECTS) $(libinst_string_la_DEPENDENCIES) - $(CXXLINK) $(libinst_string_la_LDFLAGS) $(libinst_string_la_OBJECTS) $(libinst_string_la_LIBADD) $(LIBS) + $(LINK) $(libinst_string_la_LDFLAGS) $(libinst_string_la_OBJECTS) $(libinst_string_la_LIBADD) $(LIBS) libinst-wstring.la: $(libinst_wstring_la_OBJECTS) $(libinst_wstring_la_DEPENDENCIES) $(CXXLINK) $(libinst_wstring_la_LDFLAGS) $(libinst_wstring_la_OBJECTS) $(libinst_wstring_la_LIBADD) $(LIBS) @@ -668,237 +608,11 @@ locale-inst.o: locale-inst.cc locale-inst.lo: locale-inst.cc $(LTCXXCOMPILE) -fimplicit-templates -c $< -stringMAIN.lo \ -stringCTORNC.lo \ -stringCTORAL.lo \ -stringCTORCPR.lo \ -stringCTORCPRAL.lo \ -stringCTORPRAL.lo \ -stringCTORPAL.lo \ -stringCTORPP.lo \ -stringCTORII.lo \ -stringMUTATE.lo \ -stringRESERVE.lo \ -stringSWAP.lo \ -stringSLOP.lo \ -stringRESIZE.lo \ -stringAPPCOPY.lo \ -stringAPPCPR.lo \ -stringAPPPR.lo \ -stringAPPDUP.lo \ -stringAPPII.lo \ -stringASSCP.lo \ -stringASSII.lo \ -stringINSII.lo \ -stringREPRR.lo \ -stringREPIIDUP.lo \ -stringREPII.lo \ -stringREPIII.lo \ -stringREP4I.lo \ -stringREPIIPP.lo \ -stringREPIIPP2.lo \ -stringCOPY.lo \ -stringCONII.lo \ -stringCONIIF.lo \ -stringCONPPF.lo \ -stringCONPPF2.lo \ -stringCONSC.lo \ -stringFIND.lo \ -stringFINDC.lo \ -stringRFIND.lo \ -stringRFINDC.lo \ -stringFFO.lo \ -stringFLO.lo \ -stringFFNO.lo \ -stringFLNO.lo \ -stringFLNOC.lo \ -stringCOMPARE.lo \ -stringCOMPARE2.lo \ -stringCOMPAREP.lo \ -stringCOMPAREP2.lo \ -stringADDPS.lo \ -stringADDCS.lo \ -stringEXTRACT.lo \ -stringINSERT.lo \ -stringGETLINE.lo \ -stringSCOPY.lo \ -stringEQ.lo : string-inst.cc - $(LTCXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@ - -wstringMAIN.lo \ -wstringCTORNC.lo \ -wstringCTORAL.lo \ -wstringCTORCPR.lo \ -wstringCTORCPRAL.lo \ -wstringCTORPRAL.lo \ -wstringCTORPAL.lo \ -wstringCTORPP.lo \ -wstringCTORII.lo \ -wstringMUTATE.lo \ -wstringRESERVE.lo \ -wstringSWAP.lo \ -wstringSLOP.lo \ -wstringRESIZE.lo \ -wstringAPPCOPY.lo \ -wstringAPPCPR.lo \ -wstringAPPPR.lo \ -wstringAPPDUP.lo \ -wstringAPPII.lo \ -wstringASSCP.lo \ -wstringASSII.lo \ -wstringINSII.lo \ -wstringREPRR.lo \ -wstringREPIIDUP.lo \ -wstringREPII.lo \ -wstringREPIII.lo \ -wstringREP4I.lo \ -wstringREPIIPP.lo \ -wstringREPIIPP2.lo \ -wstringCOPY.lo \ -wstringCONII.lo \ -wstringCONIIF.lo \ -wstringCONPPF.lo \ -wstringCONPPF2.lo \ -wstringCONSC.lo \ -wstringFIND.lo \ -wstringFINDC.lo \ -wstringRFIND.lo \ -wstringRFINDC.lo \ -wstringFFO.lo \ -wstringFLO.lo \ -wstringFFNO.lo \ -wstringFLNO.lo \ -wstringFLNOC.lo \ -wstringCOMPARE.lo \ -wstringCOMPARE2.lo \ -wstringCOMPAREP.lo \ -wstringCOMPAREP2.lo \ -wstringADDPS.lo \ -wstringADDCS.lo \ -wstringEXTRACT.lo \ -wstringINSERT.lo \ -wstringGETLINE.lo \ -wstringSCOPY.lo \ -wstringEQ.lo : string-inst.cc - $(LTCXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@ - -stringMAIN.o \ -stringCTORNC.o \ -stringCTORAL.o \ -stringCTORCPR.o \ -stringCTORCPRAL.o \ -stringCTORPRAL.o \ -stringCTORPAL.o \ -stringCTORPP.o \ -stringCTORII.o \ -stringMUTATE.o \ -stringRESERVE.o \ -stringSWAP.o \ -stringSLOP.o \ -stringRESIZE.o \ -stringAPPCOPY.o \ -stringAPPCPR.o \ -stringAPPPR.o \ -stringAPPDUP.o \ -stringAPPII.o \ -stringASSCP.o \ -stringASSII.o \ -stringINSII.o \ -stringREPRR.o \ -stringREPIIDUP.o \ -stringREPII.o \ -stringREPIII.o \ -stringREP4I.o \ -stringREPIIPP.o \ -stringREPIIPP2.o \ -stringCOPY.o \ -stringCONII.o \ -stringCONIIF.o \ -stringCONPPF.o \ -stringCONPPF2.o \ -stringCONSC.o \ -stringFIND.o \ -stringFINDC.o \ -stringRFIND.o \ -stringRFINDC.o \ -stringFFO.o \ -stringFLO.o \ -stringFFNO.o \ -stringFLNO.o \ -stringFLNOC.o \ -stringCOMPARE.o \ -stringCOMPARE2.o \ -stringCOMPAREP.o \ -stringCOMPAREP2.o \ -stringADDPS.o \ -stringADDCS.o \ -stringEXTRACT.o \ -stringINSERT.o \ -stringGETLINE.o \ -stringSCOPY.o \ -stringEQ.o : string-inst.cc - $(CXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@ - -wstringMAIN.o \ -wstringCTORNC.o \ -wstringCTORAL.o \ -wstringCTORCPR.o \ -wstringCTORCPRAL.o \ -wstringCTORPRAL.o \ -wstringCTORPAL.o \ -wstringCTORPP.o \ -wstringCTORII.o \ -wstringMUTATE.o \ -wstringRESERVE.o \ -wstringSWAP.o \ -wstringSLOP.o \ -wstringRESIZE.o \ -wstringAPPCOPY.o \ -wstringAPPCPR.o \ -wstringAPPPR.o \ -wstringAPPDUP.o \ -wstringAPPII.o \ -wstringASSCP.o \ -wstringASSII.o \ -wstringINSII.o \ -wstringREPRR.o \ -wstringREPIIDUP.o \ -wstringREPII.o \ -wstringREPIII.o \ -wstringREP4I.o \ -wstringREPIIPP.o \ -wstringREPIIPP2.o \ -wstringCOPY.o \ -wstringCONII.o \ -wstringCONIIF.o \ -wstringCONPPF.o \ -wstringCONPPF2.o \ -wstringCONSC.o \ -wstringFIND.o \ -wstringFINDC.o \ -wstringRFIND.o \ -wstringRFINDC.o \ -wstringFFO.o \ -wstringFLO.o \ -wstringFFNO.o \ -wstringFLNO.o \ -wstringFLNOC.o \ -wstringCOMPARE.o \ -wstringCOMPARE2.o \ -wstringCOMPAREP.o \ -wstringCOMPAREP2.o \ -wstringADDPS.o \ -wstringADDCS.o \ -wstringEXTRACT.o \ -wstringINSERT.o \ -wstringGETLINE.o \ -wstringSCOPY.o \ -wstringEQ.o : string-inst.cc - $(CXXCOMPILE) -fimplicit-templates \ - -c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@ +# We have to instantiate wstring bits too. . . +wstring-inst.o: string-inst.cc + $(CXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ +wstring-inst.lo: string-inst.cc + $(LTCXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libstdc++-v3/src/misc-inst.cc b/libstdc++-v3/src/misc-inst.cc index a512c99a245a..411a480a7487 100644 --- a/libstdc++-v3/src/misc-inst.cc +++ b/libstdc++-v3/src/misc-inst.cc @@ -1,6 +1,6 @@ // Explicit instantiation file. -// Copyright (C) 1997-1999 Free Software Foundation, Inc. +// Copyright (C) 1997-1999, 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 @@ -186,6 +186,36 @@ namespace std { #endif + // + // string related to iostreams + // + template + basic_istream<char>& + operator>>(basic_istream<char>&, string&); + template + basic_ostream<char>& + operator<<(basic_ostream<char>&, const string&); + template + basic_istream<char>& + getline(basic_istream<char>&, string&, char); + template + basic_istream<char>& + getline(basic_istream<char>&, string&); +#ifdef _GLIBCPP_USE_WCHAR_T + template + basic_istream<wchar_t>& + operator>>(basic_istream<wchar_t>&, wstring&); + template + basic_ostream<wchar_t>& + operator<<(basic_ostream<wchar_t>&, const wstring&); + template + basic_istream<wchar_t>& + getline(basic_istream<wchar_t>&, wstring&, wchar_t); + template + basic_istream<wchar_t>& + getline(basic_istream<wchar_t>&, wstring&); +#endif + // // algorithm // diff --git a/libstdc++-v3/src/string-inst.cc b/libstdc++-v3/src/string-inst.cc index 428d7baa62cb..ea1bc8df3f38 100644 --- a/libstdc++-v3/src/string-inst.cc +++ b/libstdc++-v3/src/string-inst.cc @@ -36,14 +36,6 @@ #include <bits/std_string.h> #include <bits/std_algorithm.h> -#include <bits/std_istream.h> -#include <bits/std_ostream.h> - -// NB: Unnecessary if the .h headers include these -#ifndef _GLIBCPP_FULLY_COMPLIANT_HEADERS -#include <bits/istream.tcc> -#include <bits/ostream.tcc> -#endif // Instantiation configuration. #ifndef C @@ -55,7 +47,6 @@ namespace std { typedef basic_string<C> S; -#ifdef MAIN template C S::_Rep::_S_terminal; template S::size_type S::_Rep::_S_max_size; template S::size_type S::_S_empty_rep_storage[]; @@ -64,159 +55,107 @@ namespace std template S::_Rep* S::_Rep::_S_create(size_t, S::allocator_type const&); template void S::_Rep::_M_destroy(S::allocator_type const&) throw(); template void __destroy_aux(S*, S*, __false_type); -#endif -#ifdef CTORNC template S::basic_string(S::size_type, C, S::allocator_type const&); -#endif -#ifdef CTORAL template S::basic_string(S::allocator_type const&); -#endif -#ifdef CTORCPR template S::basic_string(S const&, S::size_type, S::size_type); -#endif -#ifdef CTORCPRAL template S::basic_string( S const&, S::size_type, S::size_type, S::allocator_type const&); -#endif -#ifdef CTORPRAL template S::basic_string( C const*, S::size_type, S::allocator_type const&); -#endif -#ifdef CTORPAL template S::basic_string( C const*, S::allocator_type const&); -#endif -#ifdef CTORPP template S::basic_string (C*, C*, const allocator<C>&); -#endif -#ifdef CTORII template S::basic_string (S::iterator, S::iterator, const allocator<C>&); -#endif -#ifdef MUTATE template void S::_M_leak_hard(); template void S::_M_mutate(S::size_type, S::size_type, S::size_type); template C* S::_Rep::_M_clone(S::allocator_type const&, S::size_type); -#endif -#ifdef RESERVE template void S::reserve(S::size_type); -#endif -#ifdef SWAP template void S::swap(S&); -#endif -#ifdef SLOP # ifdef _GLIBCPP_ALLOC_CONTROL template bool (* S::_Rep::_S_excess_slop)(size_t, size_t); template bool S::_Rep::_S_default_excess(size_t, size_t); # endif -#endif -#ifdef RESIZE template void S::resize(S::size_type, C); -#endif -#ifdef APPCOPY template S& S::append(S const&); -#endif -#ifdef APPCPR template S& S::append(S const&, S::size_type, S::size_type); -#endif -#ifdef APPPR template S& S::append(C const*, S::size_type); -#endif -#ifdef APPDUP template S& S::append(S::size_type, C); -#endif -#ifdef APPII template S& S::append<S::iterator> (S::iterator, S::iterator); -#endif -#ifdef ASSCP template S& S::assign(S const&); -#endif -#ifdef ASSII template S& S::assign<S::iterator> (S::iterator, S::iterator); -#endif -#ifdef INSII template void S::insert<S::iterator> //c* (S::iterator, S::iterator, S::iterator); //it, c+, c+ and temptype = char* -#endif -#ifdef REPRR template S& S::replace( S::size_type, S::size_type, S const&, S::size_type, S::size_type); -#endif -#ifdef REPIIDUP template S& S::replace(S::iterator, S::iterator, S::size_type, C); -#endif -#ifdef REPII template S& S::replace<S::iterator> // c* (S::iterator, S::iterator, S::iterator, S::iterator); //it, it, c+, c+ -#endif -#ifdef REPIII template S& S::_M_replace<S::iterator> (S::iterator, S::iterator, S::iterator, S::iterator, forward_iterator_tag); -#endif -#ifdef REP4I // Only one template keyword allowed here. // See core issue #46 (NAD) // http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_closed.html#46 @@ -225,62 +164,44 @@ namespace std S::_M_replace<S::const_iterator> (S::iterator, S::iterator, S::const_iterator, S::const_iterator, forward_iterator_tag); -#endif -#ifdef REPIIPP template S& S::_M_replace<C*> (S::iterator, S::iterator, C*, C*, forward_iterator_tag); -#endif - -#ifdef REPIIPP2 + template S& S::_M_replace<const C*> (S::iterator, S::iterator, const C*, const C*, forward_iterator_tag); -#endif -#ifdef COPY template S::size_type S::copy(C*, S::size_type, S::size_type) const; -#endif -#ifdef CONII template C* S::_S_construct<S::iterator> (S::iterator, S::iterator, const allocator<C>&); -#endif - -#ifdef CONIIF + template C* S::_S_construct<S::iterator> (S::iterator, S::iterator, const allocator<C>&, forward_iterator_tag); -#endif -#ifdef CONPPF template C* S::_S_construct<C*> (C*, C*, const allocator<C>&, forward_iterator_tag); -#endif -#ifdef CONPPF2 template C* S::_S_construct<const C*> (const C*, const C*, const allocator<C>&, forward_iterator_tag); -#endif -#ifdef CONSC template C* S::_S_construct(S::size_type, C, S::allocator_type const&); -#endif -#ifdef FIND // These members are explicitly specialized, and can only be in one // translation unit or else we get multiple copies. . . #if _GLIBCPP_INSTANTIATING_CHAR @@ -300,101 +221,55 @@ namespace std _Char_traits_match<wchar_t, traits_type>(__c)); } #endif -#endif -#ifdef FINDC template S::size_type S::find(C, S::size_type) const; -#endif -#ifdef RFIND template S::size_type S::rfind(C const*, S::size_type, S::size_type) const; -#endif -#ifdef RFINDC template S::size_type S::rfind(C, S::size_type) const; -#endif -#ifdef FFO template S::size_type S::find_first_of(C const*, S::size_type, S::size_type) const; -#endif -#ifdef FLO template S::size_type S::find_last_of(C const*, S::size_type, S::size_type) const; -#endif -#ifdef FFNO template S::size_type S::find_first_not_of( C const*, S::size_type, S::size_type) const; -#endif -#ifdef FLNO template S::size_type S::find_last_not_of( C const*, S::size_type, S::size_type) const; -#endif -#ifdef FLNOC template S::size_type S::find_last_not_of(C, S::size_type) const; -#endif -#ifdef COMPARE template int S::compare(S::size_type, S::size_type, S const&) const; -#endif -#ifdef COMPARE2 template int S::compare(S::size_type, S::size_type, S const&, S::size_type, S::size_type) const; -#endif -#ifdef COMPAREP template int S::compare(C const*) const; -#endif -#ifdef COMPAREP2 template int S::compare( S::size_type, S::size_type, C const*, S::size_type) const; -#endif -#ifdef ADDPS template S operator+(const C*, const S&); -#endif -#ifdef ADDCS template S operator+(C, const S&); -#endif -#ifdef EQ template bool operator==(const S::iterator&, const S::iterator&); template bool operator==(const S::const_iterator&, const S::const_iterator&); -#endif -#ifdef EXTRACT - template basic_istream<C>& operator>>(basic_istream<C>&, S&); -#endif - -#ifdef INSERT - template basic_ostream<C>& operator<<(basic_ostream<C>&, const S&); -#endif - -#ifdef GETLINE - template basic_istream<C>& getline(basic_istream<C>&, S&, C); - template basic_istream<C>& getline(basic_istream<C>&, S&); -#endif - -#ifdef SCOPY template void _S_string_copy(const S&, C*, allocator<C>::size_type); -#endif } // std -- GitLab