From 6faf47517f3a989140af3d054c75718bfcc20581 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sun, 15 Jun 2014 09:44:04 +0000 Subject: [PATCH] re PR libfortran/60468 (./fpu-target.h:93:3: error: unknown type name 'choke') PR libfortran/60468 * configure.ac: Include when checking for fp_except_t and fp_rnd_t types. * configure: Regenerate. From-SVN: r211685 --- libgfortran/ChangeLog | 7 +++++++ libgfortran/configure | 20 ++++++++++++++++---- libgfortran/configure.ac | 10 ++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 9d753296445..f610ba146e1 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2014-06-15 Francois-Xavier Coudert + + PR libfortran/60468 + * configure.ac: Include when checking for fp_except_t + and fp_rnd_t types. + * configure: Regenerate. + 2014-06-08 Janne Blomqvist PR libfortran/56981 diff --git a/libgfortran/configure b/libgfortran/configure index 9841ebc0ae3..05ab1683e02 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -26042,7 +26042,10 @@ $as_echo "#define HAVE_FPSETMASK 1" >>confdefs.h fi -ac_fn_c_check_type "$LINENO" "fp_except" "ac_cv_type_fp_except" "#include +ac_fn_c_check_type "$LINENO" "fp_except" "ac_cv_type_fp_except" " +#include +#include + " if test "x$ac_cv_type_fp_except" = x""yes; then : @@ -26052,7 +26055,10 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "fp_except_t" "ac_cv_type_fp_except_t" "#include +ac_fn_c_check_type "$LINENO" "fp_except_t" "ac_cv_type_fp_except_t" " +#include +#include + " if test "x$ac_cv_type_fp_except_t" = x""yes; then : @@ -26063,7 +26069,10 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "fp_rnd" "ac_cv_type_fp_rnd" "#include +ac_fn_c_check_type "$LINENO" "fp_rnd" "ac_cv_type_fp_rnd" " +#include +#include + " if test "x$ac_cv_type_fp_rnd" = x""yes; then : @@ -26073,7 +26082,10 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "fp_rnd_t" "ac_cv_type_fp_rnd_t" "#include +ac_fn_c_check_type "$LINENO" "fp_rnd_t" "ac_cv_type_fp_rnd_t" " +#include +#include + " if test "x$ac_cv_type_fp_rnd_t" = x""yes; then : diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index ab4c497e5f3..57e26ce9e48 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -521,8 +521,14 @@ fi # Check for SysV fpsetmask LIBGFOR_CHECK_FPSETMASK -AC_CHECK_TYPES([fp_except,fp_except_t], [], [], [[#include ]]) -AC_CHECK_TYPES([fp_rnd,fp_rnd_t], [], [], [[#include ]]) +AC_CHECK_TYPES([fp_except,fp_except_t], [], [], [[ +#include +#include +]]) +AC_CHECK_TYPES([fp_rnd,fp_rnd_t], [], [], [[ +#include +#include +]]) # Check for AIX fp_trap and fp_enable AC_CHECK_FUNC([fp_trap],[have_fp_trap=yes AC_DEFINE([HAVE_FP_TRAP],[1],[fp_trap is present])])