⛏️ index : buildtools.git

author Jonathan Schleifer <js@webkeks.org> 2014-07-19 23:04:37.0 +02:00:00
committer Jonathan Schleifer <js@webkeks.org> 2014-07-19 23:04:37.0 +02:00:00
commit
17ba980278fc30125216491bbbbc86e53bebed2a [patch]
tree
a4242db73342218f6ac1aaa312ce1b9c9df997ca
parent
9d26d59ebc0cd32e1ec9c4538eb187545078f8b6
download
17ba980278fc30125216491bbbbc86e53bebed2a.tar.gz

Fix libstdc++ not using TLS when cross compiling



Diff

 gcc/libstdc++-v3/configure      | 587 ++++++++------------------------------------------------------------------------
 gcc/libstdc++-v3/crossconfig.m4 |   3 +--
 2 files changed, 50 insertions(+), 540 deletions(-)

diff --git a/gcc/libstdc++-v3/configure b/gcc/libstdc++-v3/configure
index e7b0a13..dd7bf5c 100755
--- a/gcc/libstdc++-v3/configure
+++ b/gcc/libstdc++-v3/configure
@@ -11226,7 +11226,7 @@
  lt_cv_dlopen_libs=

  case $host_os in
  beos* | haiku*)
  beos* | haiku* )
    lt_cv_dlopen="load_add_on"
    lt_cv_dlopen_libs=
    lt_cv_dlopen_self=yes
@@ -12577,8 +12577,8 @@
        ;;

      haiku*)
        allow_undefined_flag=unsupported
        archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
        allow_undefined_flag_CXX=unsupported
        archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
        ;;

      hpux9*)
@@ -13445,7 +13445,6 @@
        ;;
      esac
      ;;

    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
      # PIC is the default for these OSes.
      ;;
@@ -15039,7 +15038,7 @@
    #
    # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
    cat > conftest.$ac_ext << EOF
#line 15042 "configure"
#line 15041 "configure"
struct S { ~S(); };
void bar();
void foo()
@@ -15389,7 +15388,7 @@
  # Fake what AC_TRY_COMPILE does.

    cat > conftest.$ac_ext << EOF
#line 15392 "configure"
#line 15391 "configure"
int main()
{
  typedef bool atomic_type;
@@ -15424,7 +15423,7 @@
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
#line 15427 "configure"
#line 15426 "configure"
int main()
{
  typedef short atomic_type;
@@ -15459,7 +15458,7 @@
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
#line 15462 "configure"
#line 15461 "configure"
int main()
{
  // NB: _Atomic_word not necessarily int.
@@ -15495,7 +15494,7 @@
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
#line 15498 "configure"
#line 15497 "configure"
int main()
{
  typedef long long atomic_type;
@@ -15574,7 +15573,7 @@
  # unnecessary for this test.

    cat > conftest.$ac_ext << EOF
#line 15577 "configure"
#line 15576 "configure"
int main()
{
  _Decimal32 d1;
@@ -15616,7 +15615,7 @@
  # unnecessary for this test.

    cat > conftest.$ac_ext << EOF
#line 15619 "configure"
#line 15618 "configure"
template<typename T1, typename T2>
  struct same
  { typedef T2 type; };
@@ -15650,7 +15649,7 @@
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
#line 15653 "configure"
#line 15652 "configure"
template<typename T1, typename T2>
  struct same
  { typedef T2 type; };
@@ -45705,157 +45704,18 @@

    fi
    ;;
  *haiku*)















for ac_header in nan.h ieeefp.h endian.h sys/isa_defs.h \
  *-haiku*)
    for ac_header in nan.h ieeefp.h endian.h sys/isa_defs.h \
      machine/endian.h machine/param.h sys/machine.h sys/types.h \
      fp.h float.h endian.h inttypes.h locale.h float.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  { echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
	       { echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
else
  # Is the header compilable?
{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
	 test -z "$ac_c_werror_flag" ||
	 test ! -s conftest.err
       } && test -s conftest.$ac_objext; then
  ac_header_compiler=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

	ac_header_compiler=no
fi

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }

# Is the header present?
{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <$ac_header>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null && {
	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
	 test ! -s conftest.err
       }; then
  ac_header_preproc=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

  ac_header_preproc=no
fi

rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
    ac_header_preproc=yes
    ;;
  no:yes:* )
    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

    ;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  eval "$as_ac_Header=\$ac_header_preproc"
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
	       { echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }

fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
eval as_val=\$$as_ac_Header
   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF

fi
@@ -45863,420 +45723,71 @@
done

    SECTION_FLAGS='-ffunction-sections -fdata-sections'


    cat >>confdefs.h <<\_ACEOF
#define HAVE_INT64_T 1
_ACEOF


    cat >>confdefs.h <<\_ACEOF
#define HAVE_ACOSF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ASINF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ATANF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ATAN2F 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_CEILF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COPYSIGN 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COPYSIGNF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COSF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COSHF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_EXPF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FABSF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FINITE 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FINITEF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FLOORF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FMODF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FREXPF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_HYPOT 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_HYPOTF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISINF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISINFF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISNAN 1
_ACEOF
    $as_echo "#define HAVE_INT64_T 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISNANF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_LOGF 1
_ACEOF
    $as_echo "#define HAVE_ACOSF 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_LOG10F 1
_ACEOF
    $as_echo "#define HAVE_ASINF 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_MODFF 1
_ACEOF
    $as_echo "#define HAVE_ATANF 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_SINF 1
_ACEOF
    $as_echo "#define HAVE_ATAN2F 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_SINHF 1
_ACEOF
    $as_echo "#define HAVE_CEILF 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_SQRTF 1
_ACEOF
    $as_echo "#define HAVE_COSF 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_TANF 1
_ACEOF
    $as_echo "#define HAVE_COSHF 1" >>confdefs.h

    cat >>confdefs.h <<\_ACEOF
#define HAVE_TANHF 1
_ACEOF
    $as_echo "#define HAVE_EXPF 1" >>confdefs.h

    ;;
  *haiku*)
    $as_echo "#define HAVE_FABSF 1" >>confdefs.h

    $as_echo "#define HAVE_FINITE 1" >>confdefs.h

    $as_echo "#define HAVE_FINITEF 1" >>confdefs.h

    $as_echo "#define HAVE_FLOORF 1" >>confdefs.h

    $as_echo "#define HAVE_FMODF 1" >>confdefs.h

    $as_echo "#define HAVE_FREXPF 1" >>confdefs.h

    $as_echo "#define HAVE_HYPOT 1" >>confdefs.h

    $as_echo "#define HAVE_HYPOTF 1" >>confdefs.h

    $as_echo "#define HAVE_ISINF 1" >>confdefs.h

    $as_echo "#define HAVE_ISINFF 1" >>confdefs.h

    $as_echo "#define HAVE_ISNAN 1" >>confdefs.h

    $as_echo "#define HAVE_ISNANF 1" >>confdefs.h

    $as_echo "#define HAVE_LOGF 1" >>confdefs.h

    $as_echo "#define HAVE_LOG10F 1" >>confdefs.h

    $as_echo "#define HAVE_MODFF 1" >>confdefs.h

for ac_header in nan.h ieeefp.h endian.h sys/isa_defs.h \
      machine/endian.h machine/param.h sys/machine.h sys/types.h \
      fp.h float.h endian.h inttypes.h locale.h float.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  { echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
	       { echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
else
  # Is the header compilable?
{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
	 test -z "$ac_c_werror_flag" ||
	 test ! -s conftest.err
       } && test -s conftest.$ac_objext; then
  ac_header_compiler=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
    $as_echo "#define HAVE_SINF 1" >>confdefs.h

	ac_header_compiler=no
fi
    $as_echo "#define HAVE_SINHF 1" >>confdefs.h

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
    $as_echo "#define HAVE_SQRTF 1" >>confdefs.h

# Is the header present?
{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <$ac_header>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null && {
	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
	 test ! -s conftest.err
       }; then
  ac_header_preproc=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
    $as_echo "#define HAVE_TANF 1" >>confdefs.h

  ac_header_preproc=no
fi
    $as_echo "#define HAVE_TANHF 1" >>confdefs.h

rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
    ac_header_preproc=yes
    ;;
  no:yes:* )
    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
    $as_echo "#define HAVE_TLS 1" >>confdefs.h

    ;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  eval "$as_ac_Header=\$ac_header_preproc"
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
	       { echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }

fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
  cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF

fi

done

    SECTION_FLAGS='-ffunction-sections -fdata-sections'


    cat >>confdefs.h <<\_ACEOF
#define HAVE_INT64_T 1
_ACEOF


    cat >>confdefs.h <<\_ACEOF
#define HAVE_ACOSF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ASINF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ATANF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ATAN2F 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_CEILF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COPYSIGN 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COPYSIGNF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COSF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_COSHF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_EXPF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FABSF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FINITE 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FINITEF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FLOORF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FMODF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_FREXPF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_HYPOT 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_HYPOTF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISINF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISINFF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISNAN 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_ISNANF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_LOGF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_LOG10F 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_MODFF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_SINF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_SINHF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_SQRTF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_TANF 1
_ACEOF

    cat >>confdefs.h <<\_ACEOF
#define HAVE_TANHF 1
_ACEOF

    ;;
  *-hpux*)
    SECTION_FLAGS='-ffunction-sections -fdata-sections'

diff --git a/gcc/libstdc++-v3/crossconfig.m4 b/gcc/libstdc++-v3/crossconfig.m4
index 84b3f88..630ec31 100644
--- a/gcc/libstdc++-v3/crossconfig.m4
+++ b/gcc/libstdc++-v3/crossconfig.m4
@@ -114,8 +114,6 @@
    AC_DEFINE(HAVE_ATANF)
    AC_DEFINE(HAVE_ATAN2F)
    AC_DEFINE(HAVE_CEILF)
    AC_DEFINE(HAVE_COPYSIGN)
    AC_DEFINE(HAVE_COPYSIGNF)
    AC_DEFINE(HAVE_COSF)
    AC_DEFINE(HAVE_COSHF)
    AC_DEFINE(HAVE_EXPF)
@@ -139,6 +137,7 @@
    AC_DEFINE(HAVE_SQRTF)
    AC_DEFINE(HAVE_TANF)
    AC_DEFINE(HAVE_TANHF)
    AC_DEFINE(HAVE_TLS)
    ;;

  *-hpux*)