Per RFC, continue the build system renaming
OMPI_C_GET_ALIGNMENT -> OPAL_C_GET_ALIGNMENT ompi_cv_c_align_ -> opal_cv_c_align_ This commit was SVN r31648.
Этот коммит содержится в:
родитель
2b7a3ae601
Коммит
002cd34013
@ -22,9 +22,9 @@ dnl
|
||||
# ----------------------------------
|
||||
# Determine datatype alignment.
|
||||
# First arg is type, 2nd arg is config var to define.
|
||||
AC_DEFUN([OMPI_C_GET_ALIGNMENT],[
|
||||
AC_DEFUN([OPAL_C_GET_ALIGNMENT],[
|
||||
AC_CACHE_CHECK([alignment of $1],
|
||||
[AS_TR_SH([ompi_cv_c_align_$1])],
|
||||
[AS_TR_SH([opal_cv_c_align_$1])],
|
||||
[AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
|
||||
[[
|
||||
struct foo { char c; $1 x; };
|
||||
@ -34,7 +34,7 @@ AC_DEFUN([OMPI_C_GET_ALIGNMENT],[
|
||||
if (!f) exit(1);
|
||||
diff = ((char *)&p->x) - ((char *)&p->c);
|
||||
fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
|
||||
]])], [AS_TR_SH([ompi_cv_c_align_$1])=`cat conftestval`],
|
||||
]])], [AS_TR_SH([opal_cv_c_align_$1])=`cat conftestval`],
|
||||
[AC_MSG_WARN([*** Problem running configure test!])
|
||||
AC_MSG_WARN([*** See config.log for details.])
|
||||
AC_MSG_ERROR([*** Cannot continue.])],
|
||||
@ -42,7 +42,7 @@ AC_DEFUN([OMPI_C_GET_ALIGNMENT],[
|
||||
# taken from the Autoconf 2.59c. Switch to using
|
||||
# AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
|
||||
_AC_COMPUTE_INT([(long int) offsetof (ompi__type_alignof_, y)],
|
||||
[AS_TR_SH([ompi_cv_c_align_$1])],
|
||||
[AS_TR_SH([opal_cv_c_align_$1])],
|
||||
[AC_INCLUDES_DEFAULT
|
||||
#ifndef offsetof
|
||||
# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
|
||||
@ -53,7 +53,7 @@ typedef struct { char x; $1 y; } ompi__type_alignof_;
|
||||
AC_MSG_WARN([*** See config.log for details.])
|
||||
AC_MSG_ERROR([*** Cannot continue.])])])])
|
||||
|
||||
AC_DEFINE_UNQUOTED([$2], [$AS_TR_SH([ompi_cv_c_align_$1])], [Alignment of type $1])
|
||||
eval "$2=$AS_TR_SH([ompi_cv_c_align_$1])"
|
||||
AC_DEFINE_UNQUOTED([$2], [$AS_TR_SH([opal_cv_c_align_$1])], [Alignment of type $1])
|
||||
eval "$2=$AS_TR_SH([opal_cv_c_align_$1])"
|
||||
|
||||
rm -rf conftest* ]) dnl
|
||||
|
@ -279,7 +279,7 @@ EOF
|
||||
# bool type size and alignment
|
||||
AC_LANG_PUSH(C++)
|
||||
AC_CHECK_SIZEOF(bool)
|
||||
OMPI_C_GET_ALIGNMENT(bool, OPAL_ALIGNMENT_CXX_BOOL)
|
||||
OPAL_C_GET_ALIGNMENT(bool, OPAL_ALIGNMENT_CXX_BOOL)
|
||||
AC_LANG_POP(C++)
|
||||
])
|
||||
|
||||
|
@ -217,6 +217,6 @@ EOF
|
||||
# bool type size and alignment
|
||||
AC_LANG_PUSH(C++)
|
||||
AC_CHECK_SIZEOF(bool)
|
||||
OMPI_C_GET_ALIGNMENT(bool, OPAL_ALIGNMENT_CXX_BOOL)
|
||||
OPAL_C_GET_ALIGNMENT(bool, OPAL_ALIGNMENT_CXX_BOOL)
|
||||
AC_LANG_POP(C++)
|
||||
])
|
||||
|
42
configure.ac
42
configure.ac
@ -420,46 +420,46 @@ AC_CHECK_SIZEOF(pid_t)
|
||||
# Check for type alignments
|
||||
#
|
||||
|
||||
OMPI_C_GET_ALIGNMENT(_Bool, OPAL_ALIGNMENT_BOOL)
|
||||
OMPI_C_GET_ALIGNMENT(int8_t, OPAL_ALIGNMENT_INT8)
|
||||
OMPI_C_GET_ALIGNMENT(int16_t, OPAL_ALIGNMENT_INT16)
|
||||
OMPI_C_GET_ALIGNMENT(int32_t, OPAL_ALIGNMENT_INT32)
|
||||
OMPI_C_GET_ALIGNMENT(int64_t, OPAL_ALIGNMENT_INT64)
|
||||
OPAL_C_GET_ALIGNMENT(_Bool, OPAL_ALIGNMENT_BOOL)
|
||||
OPAL_C_GET_ALIGNMENT(int8_t, OPAL_ALIGNMENT_INT8)
|
||||
OPAL_C_GET_ALIGNMENT(int16_t, OPAL_ALIGNMENT_INT16)
|
||||
OPAL_C_GET_ALIGNMENT(int32_t, OPAL_ALIGNMENT_INT32)
|
||||
OPAL_C_GET_ALIGNMENT(int64_t, OPAL_ALIGNMENT_INT64)
|
||||
if test "$ac_cv_type_int128_t" = yes ; then
|
||||
OMPI_C_GET_ALIGNMENT(int128_t, OPAL_ALIGNMENT_INT128)
|
||||
OPAL_C_GET_ALIGNMENT(int128_t, OPAL_ALIGNMENT_INT128)
|
||||
fi
|
||||
OMPI_C_GET_ALIGNMENT(char, OPAL_ALIGNMENT_CHAR)
|
||||
OMPI_C_GET_ALIGNMENT(short, OPAL_ALIGNMENT_SHORT)
|
||||
OMPI_C_GET_ALIGNMENT(wchar_t, OPAL_ALIGNMENT_WCHAR)
|
||||
OMPI_C_GET_ALIGNMENT(int, OPAL_ALIGNMENT_INT)
|
||||
OMPI_C_GET_ALIGNMENT(long, OPAL_ALIGNMENT_LONG)
|
||||
OPAL_C_GET_ALIGNMENT(char, OPAL_ALIGNMENT_CHAR)
|
||||
OPAL_C_GET_ALIGNMENT(short, OPAL_ALIGNMENT_SHORT)
|
||||
OPAL_C_GET_ALIGNMENT(wchar_t, OPAL_ALIGNMENT_WCHAR)
|
||||
OPAL_C_GET_ALIGNMENT(int, OPAL_ALIGNMENT_INT)
|
||||
OPAL_C_GET_ALIGNMENT(long, OPAL_ALIGNMENT_LONG)
|
||||
if test "$ac_cv_type_long_long" = yes; then
|
||||
OMPI_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
|
||||
OPAL_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
|
||||
fi
|
||||
OMPI_C_GET_ALIGNMENT(float, OPAL_ALIGNMENT_FLOAT)
|
||||
OMPI_C_GET_ALIGNMENT(double, OPAL_ALIGNMENT_DOUBLE)
|
||||
OPAL_C_GET_ALIGNMENT(float, OPAL_ALIGNMENT_FLOAT)
|
||||
OPAL_C_GET_ALIGNMENT(double, OPAL_ALIGNMENT_DOUBLE)
|
||||
if test "$ac_cv_type_long_double" = yes; then
|
||||
OMPI_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
|
||||
OPAL_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
|
||||
fi
|
||||
if test "$ac_cv_type___float128" = yes; then
|
||||
OMPI_C_GET_ALIGNMENT(__float128, OPAL_ALIGNMENT___FLOAT128)
|
||||
OPAL_C_GET_ALIGNMENT(__float128, OPAL_ALIGNMENT___FLOAT128)
|
||||
fi
|
||||
|
||||
|
||||
# We only need these types if we're building the OMPI project, but
|
||||
# OPAL currently doesn't protect for their lack of presence well.
|
||||
if test "$ac_cv_type_float__Complex" = yes; then
|
||||
OMPI_C_GET_ALIGNMENT(float _Complex, OPAL_ALIGNMENT_FLOAT_COMPLEX)
|
||||
OPAL_C_GET_ALIGNMENT(float _Complex, OPAL_ALIGNMENT_FLOAT_COMPLEX)
|
||||
fi
|
||||
if test "$ac_cv_type_double__Complex" = yes; then
|
||||
OMPI_C_GET_ALIGNMENT(double _Complex, OPAL_ALIGNMENT_DOUBLE_COMPLEX)
|
||||
OPAL_C_GET_ALIGNMENT(double _Complex, OPAL_ALIGNMENT_DOUBLE_COMPLEX)
|
||||
fi
|
||||
if test "$ac_cv_type_long_double__Complex" = yes; then
|
||||
OMPI_C_GET_ALIGNMENT(long double _Complex, OPAL_ALIGNMENT_LONG_DOUBLE_COMPLEX)
|
||||
OPAL_C_GET_ALIGNMENT(long double _Complex, OPAL_ALIGNMENT_LONG_DOUBLE_COMPLEX)
|
||||
fi
|
||||
|
||||
OMPI_C_GET_ALIGNMENT(void *, OPAL_ALIGNMENT_VOID_P)
|
||||
OMPI_C_GET_ALIGNMENT(size_t, OPAL_ALIGNMENT_SIZE_T)
|
||||
OPAL_C_GET_ALIGNMENT(void *, OPAL_ALIGNMENT_VOID_P)
|
||||
OPAL_C_GET_ALIGNMENT(size_t, OPAL_ALIGNMENT_SIZE_T)
|
||||
|
||||
#
|
||||
# Does the C compiler native support "bool"? (i.e., without
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user