Skip to content

Commit 4e6403a

Browse files
committed
configure: Remove $ac_cv_type_[TYPE] checks for C99 types
Now Open MPI requires a C99 compiler. Checking availability of the following types is no more needed. - `long long` (`signed` and `unsigned`) - `long double` - `float _Complex` - `double _Complex` - `long double _Complex` Signed-off-by: KAWASHIMA Takahiro <t-kawashima@jp.fujitsu.com>
1 parent cacd6f3 commit 4e6403a

File tree

2 files changed

+11
-32
lines changed

2 files changed

+11
-32
lines changed

config/ompi_find_mpi_aint_count_offset.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ AC_DEFUN([_OMPI_FIND_MPI_COUNT_TYPE], [
9797

9898
MPI_COUNT_TYPE=unknonwn
9999
AC_MSG_CHECKING([for type of MPI_Count])
100-
if test $ac_cv_type_long_long = yes && \
101-
test $ac_cv_sizeof_long_long -le $ac_cv_sizeof_size_t && \
100+
if test $ac_cv_sizeof_long_long -le $ac_cv_sizeof_size_t && \
102101
test $ac_cv_sizeof_long_long -ge $MPI_AINT_SIZE; then
103102
MPI_COUNT_TYPE="long long"
104103
MPI_COUNT_DATATYPE=MPI_LONG_LONG

configure.ac

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -410,28 +410,18 @@ AC_CHECK_SIZEOF(char)
410410
AC_CHECK_SIZEOF(short)
411411
AC_CHECK_SIZEOF(int)
412412
AC_CHECK_SIZEOF(long)
413-
if test "$ac_cv_type_long_long" = yes; then
414-
AC_CHECK_SIZEOF(long long)
415-
fi
413+
AC_CHECK_SIZEOF(long long)
416414
AC_CHECK_SIZEOF(float)
417415
AC_CHECK_SIZEOF(double)
418-
if test "$ac_cv_type_long_double" = yes; then
419-
AC_CHECK_SIZEOF(long double)
420-
fi
416+
AC_CHECK_SIZEOF(long double)
421417
if test "$ac_cv_type___float128" = yes; then
422418
AC_CHECK_SIZEOF(__float128)
423419
fi
424420
# We only need these types if we're building the OMPI project, but
425421
# OPAL currently doesn't protect for their lack of presence well.
426-
if test "$ac_cv_type_float__Complex" = yes; then
427-
AC_CHECK_SIZEOF(float _Complex)
428-
fi
429-
if test "$ac_cv_type_double__Complex" = yes; then
430-
AC_CHECK_SIZEOF(double _Complex)
431-
fi
432-
if test "$ac_cv_type_long_double__Complex" = yes; then
433-
AC_CHECK_SIZEOF(long double _Complex)
434-
fi
422+
AC_CHECK_SIZEOF(float _Complex)
423+
AC_CHECK_SIZEOF(double _Complex)
424+
AC_CHECK_SIZEOF(long double _Complex)
435425

436426
AC_CHECK_SIZEOF(void *)
437427
AC_CHECK_SIZEOF(size_t)
@@ -470,30 +460,20 @@ OPAL_C_GET_ALIGNMENT(short, OPAL_ALIGNMENT_SHORT)
470460
OPAL_C_GET_ALIGNMENT(wchar_t, OPAL_ALIGNMENT_WCHAR)
471461
OPAL_C_GET_ALIGNMENT(int, OPAL_ALIGNMENT_INT)
472462
OPAL_C_GET_ALIGNMENT(long, OPAL_ALIGNMENT_LONG)
473-
if test "$ac_cv_type_long_long" = yes; then
474-
OPAL_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
475-
fi
463+
OPAL_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
476464
OPAL_C_GET_ALIGNMENT(float, OPAL_ALIGNMENT_FLOAT)
477465
OPAL_C_GET_ALIGNMENT(double, OPAL_ALIGNMENT_DOUBLE)
478-
if test "$ac_cv_type_long_double" = yes; then
479-
OPAL_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
480-
fi
466+
OPAL_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
481467
if test "$ac_cv_type___float128" = yes; then
482468
OPAL_C_GET_ALIGNMENT(__float128, OPAL_ALIGNMENT___FLOAT128)
483469
fi
484470

485471

486472
# We only need these types if we're building the OMPI project, but
487473
# OPAL currently doesn't protect for their lack of presence well.
488-
if test "$ac_cv_type_float__Complex" = yes; then
489-
OPAL_C_GET_ALIGNMENT(float _Complex, OPAL_ALIGNMENT_FLOAT_COMPLEX)
490-
fi
491-
if test "$ac_cv_type_double__Complex" = yes; then
492-
OPAL_C_GET_ALIGNMENT(double _Complex, OPAL_ALIGNMENT_DOUBLE_COMPLEX)
493-
fi
494-
if test "$ac_cv_type_long_double__Complex" = yes; then
495-
OPAL_C_GET_ALIGNMENT(long double _Complex, OPAL_ALIGNMENT_LONG_DOUBLE_COMPLEX)
496-
fi
474+
OPAL_C_GET_ALIGNMENT(float _Complex, OPAL_ALIGNMENT_FLOAT_COMPLEX)
475+
OPAL_C_GET_ALIGNMENT(double _Complex, OPAL_ALIGNMENT_DOUBLE_COMPLEX)
476+
OPAL_C_GET_ALIGNMENT(long double _Complex, OPAL_ALIGNMENT_LONG_DOUBLE_COMPLEX)
497477

498478
OPAL_C_GET_ALIGNMENT(void *, OPAL_ALIGNMENT_VOID_P)
499479
OPAL_C_GET_ALIGNMENT(size_t, OPAL_ALIGNMENT_SIZE_T)

0 commit comments

Comments
 (0)