Per RFC, continue renaming of build tools:
ompi_c_vendor -> opal_c_vendor ompi_cv_c_compiler_vendor -> opal_cv_c_compiler_vendor This commit was SVN r31646.
Этот коммит содержится в:
родитель
f60aadd989
Коммит
390d29733f
@ -41,7 +41,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_REAL16_C_EQUIV],[
|
|||||||
AS_IF([test "$happy" = "no"],
|
AS_IF([test "$happy" = "no"],
|
||||||
[AC_MSG_RESULT([$happy])
|
[AC_MSG_RESULT([$happy])
|
||||||
# Intel compiler has a special type that should work
|
# Intel compiler has a special type that should work
|
||||||
AS_IF([test "$ompi_cv_c_compiler_vendor" = "intel"],
|
AS_IF([test "$opal_cv_c_compiler_vendor" = "intel"],
|
||||||
[AC_MSG_CHECKING([if intel compiler _Quad == REAL*16])
|
[AC_MSG_CHECKING([if intel compiler _Quad == REAL*16])
|
||||||
CFLAGS_save="$CFLAGS"
|
CFLAGS_save="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS -Qoption,cpp,--extended_float_types"
|
CFLAGS="$CFLAGS -Qoption,cpp,--extended_float_types"
|
||||||
@ -53,7 +53,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_REAL16_C_EQUIV],[
|
|||||||
[CFLAGS="$CFLAGS_save"
|
[CFLAGS="$CFLAGS_save"
|
||||||
AC_MSG_RESULT([does not work])])
|
AC_MSG_RESULT([does not work])])
|
||||||
])
|
])
|
||||||
AS_IF([test "$ompi_cv_c_compiler_vendor" = "gnu" -a "$ac_cv_type___float128" = "yes"],
|
AS_IF([test "$opal_cv_c_compiler_vendor" = "gnu" -a "$ac_cv_type___float128" = "yes"],
|
||||||
[AC_MSG_CHECKING([if gnu compiler __float128 == REAL*16])
|
[AC_MSG_CHECKING([if gnu compiler __float128 == REAL*16])
|
||||||
OPAL_UNIQ([CFLAGS])
|
OPAL_UNIQ([CFLAGS])
|
||||||
OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([__float128], [q])
|
OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([__float128], [q])
|
||||||
|
@ -26,7 +26,7 @@ AC_DEFUN([OMPI_MICROSOFT_COMPILER],[
|
|||||||
# able to include windows.h. Most of the types that follow are defined
|
# able to include windows.h. Most of the types that follow are defined
|
||||||
# in this file. If we check for it here it will get included in the
|
# in this file. If we check for it here it will get included in the
|
||||||
# default list of header files.
|
# default list of header files.
|
||||||
if test "x$ompi_cv_c_compiler_vendor" = "xmicrosoft" ; then
|
if test "x$opal_cv_c_compiler_vendor" = "xmicrosoft" ; then
|
||||||
|
|
||||||
opal_show_subtitle "Microsoft specific detection"
|
opal_show_subtitle "Microsoft specific detection"
|
||||||
|
|
||||||
|
@ -268,7 +268,7 @@ AC_DEFUN([OPAL_CHECK_ATTRIBUTES], [
|
|||||||
[])
|
[])
|
||||||
|
|
||||||
ATTRIBUTE_CFLAGS=
|
ATTRIBUTE_CFLAGS=
|
||||||
case "$ompi_c_vendor" in
|
case "$opal_c_vendor" in
|
||||||
gnu)
|
gnu)
|
||||||
ATTRIBUTE_CFLAGS="-Wall"
|
ATTRIBUTE_CFLAGS="-Wall"
|
||||||
;;
|
;;
|
||||||
@ -294,7 +294,7 @@ AC_DEFUN([OPAL_CHECK_ATTRIBUTES], [
|
|||||||
[$ATTRIBUTE_CFLAGS])
|
[$ATTRIBUTE_CFLAGS])
|
||||||
|
|
||||||
ATTRIBUTE_CFLAGS=
|
ATTRIBUTE_CFLAGS=
|
||||||
case "$ompi_c_vendor" in
|
case "$opal_c_vendor" in
|
||||||
gnu)
|
gnu)
|
||||||
ATTRIBUTE_CFLAGS="-Wall"
|
ATTRIBUTE_CFLAGS="-Wall"
|
||||||
;;
|
;;
|
||||||
@ -372,7 +372,7 @@ AC_DEFUN([OPAL_CHECK_ATTRIBUTES], [
|
|||||||
# Ignored by PGI-6.2.5 (pgCC) -- recognized by cross-check
|
# Ignored by PGI-6.2.5 (pgCC) -- recognized by cross-check
|
||||||
#
|
#
|
||||||
ATTRIBUTE_CFLAGS=
|
ATTRIBUTE_CFLAGS=
|
||||||
case "$ompi_c_vendor" in
|
case "$opal_c_vendor" in
|
||||||
gnu)
|
gnu)
|
||||||
ATTRIBUTE_CFLAGS="-Wall"
|
ATTRIBUTE_CFLAGS="-Wall"
|
||||||
;;
|
;;
|
||||||
@ -456,7 +456,7 @@ AC_DEFUN([OPAL_CHECK_ATTRIBUTES], [
|
|||||||
# Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
|
# Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
|
||||||
#
|
#
|
||||||
ATTRIBUTE_CFLAGS=
|
ATTRIBUTE_CFLAGS=
|
||||||
case "$ompi_c_vendor" in
|
case "$opal_c_vendor" in
|
||||||
gnu)
|
gnu)
|
||||||
ATTRIBUTE_CFLAGS="-Wall"
|
ATTRIBUTE_CFLAGS="-Wall"
|
||||||
;;
|
;;
|
||||||
@ -508,7 +508,7 @@ AC_DEFUN([OPAL_CHECK_ATTRIBUTES], [
|
|||||||
# Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
|
# Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
|
||||||
#
|
#
|
||||||
ATTRIBUTE_CFLAGS=
|
ATTRIBUTE_CFLAGS=
|
||||||
case "$ompi_c_vendor" in
|
case "$opal_c_vendor" in
|
||||||
gnu)
|
gnu)
|
||||||
ATTRIBUTE_CFLAGS="-Wall"
|
ATTRIBUTE_CFLAGS="-Wall"
|
||||||
;;
|
;;
|
||||||
|
@ -30,12 +30,12 @@ AC_DEFUN([OMPI_C_COMPILER_VENDOR], [
|
|||||||
AC_REQUIRE([AC_PROG_CC])
|
AC_REQUIRE([AC_PROG_CC])
|
||||||
|
|
||||||
AC_CACHE_CHECK([for the C compiler vendor],
|
AC_CACHE_CHECK([for the C compiler vendor],
|
||||||
[ompi_cv_c_compiler_vendor],
|
[opal_cv_c_compiler_vendor],
|
||||||
[AC_LANG_PUSH(C)
|
[AC_LANG_PUSH(C)
|
||||||
_OMPI_CHECK_COMPILER_VENDOR([ompi_cv_c_compiler_vendor])
|
_OMPI_CHECK_COMPILER_VENDOR([opal_cv_c_compiler_vendor])
|
||||||
AC_LANG_POP(C)])
|
AC_LANG_POP(C)])
|
||||||
|
|
||||||
$1="$ompi_cv_c_compiler_vendor"
|
$1="$opal_cv_c_compiler_vendor"
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
@ -55,7 +55,7 @@ AC_DEFUN([OMPI_CXX_COMPILER_VENDOR], [
|
|||||||
_OMPI_CHECK_COMPILER_VENDOR([ompi_cv_cxx_compiler_vendor])
|
_OMPI_CHECK_COMPILER_VENDOR([ompi_cv_cxx_compiler_vendor])
|
||||||
AC_LANG_POP(C++)])
|
AC_LANG_POP(C++)])
|
||||||
|
|
||||||
$1="$ompi_cv_c_compiler_vendor"
|
$1="$opal_cv_c_compiler_vendor"
|
||||||
])
|
])
|
||||||
|
|
||||||
# workaround to avoid syntax error with Autoconf < 2.68:
|
# workaround to avoid syntax error with Autoconf < 2.68:
|
||||||
|
@ -40,7 +40,7 @@ AC_DEFUN([OPAL_CHECK_VISIBILITY],[
|
|||||||
CFLAGS_orig=$CFLAGS
|
CFLAGS_orig=$CFLAGS
|
||||||
|
|
||||||
opal_add=
|
opal_add=
|
||||||
case "$ompi_c_vendor" in
|
case "$opal_c_vendor" in
|
||||||
sun)
|
sun)
|
||||||
# Check using Sun Studio -xldscope=hidden flag
|
# Check using Sun Studio -xldscope=hidden flag
|
||||||
opal_add=-xldscope=hidden
|
opal_add=-xldscope=hidden
|
||||||
|
@ -40,7 +40,7 @@ dnl #################################################################
|
|||||||
AC_DEFUN([OMPI_CHECK_ASM_TEXT],[
|
AC_DEFUN([OMPI_CHECK_ASM_TEXT],[
|
||||||
AC_MSG_CHECKING([directive for setting text section])
|
AC_MSG_CHECKING([directive for setting text section])
|
||||||
opal_cv_asm_text=""
|
opal_cv_asm_text=""
|
||||||
if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
|
if test "$opal_cv_c_compiler_vendor" = "microsoft" ; then
|
||||||
# text section will be brought in with the rest of
|
# text section will be brought in with the rest of
|
||||||
# header for MS - leave blank for now
|
# header for MS - leave blank for now
|
||||||
opal_cv_asm_text=""
|
opal_cv_asm_text=""
|
||||||
@ -75,7 +75,7 @@ dnl #################################################################
|
|||||||
AC_DEFUN([OMPI_CHECK_ASM_GLOBAL],[
|
AC_DEFUN([OMPI_CHECK_ASM_GLOBAL],[
|
||||||
AC_MSG_CHECKING([directive for exporting symbols])
|
AC_MSG_CHECKING([directive for exporting symbols])
|
||||||
opal_cv_asm_global=""
|
opal_cv_asm_global=""
|
||||||
if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
|
if test "$opal_cv_c_compiler_vendor" = "microsoft" ; then
|
||||||
opal_cv_asm_global="PUBLIC"
|
opal_cv_asm_global="PUBLIC"
|
||||||
else
|
else
|
||||||
case $host in
|
case $host in
|
||||||
@ -591,7 +591,7 @@ AC_DEFUN([OMPI_CHECK_INLINE_C_GCC],[
|
|||||||
|
|
||||||
AC_MSG_CHECKING([if $CC supports GCC inline assembly])
|
AC_MSG_CHECKING([if $CC supports GCC inline assembly])
|
||||||
|
|
||||||
if test "$ompi_cv_c_compiler_vendor" = "portland group" ; then
|
if test "$opal_cv_c_compiler_vendor" = "portland group" ; then
|
||||||
# PGI seems to have some issues with our inline assembly.
|
# PGI seems to have some issues with our inline assembly.
|
||||||
# Disable for now.
|
# Disable for now.
|
||||||
asm_result="no (Portland Group)"
|
asm_result="no (Portland Group)"
|
||||||
|
@ -48,7 +48,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
OMPI_C_COMPILER_VENDOR([ompi_c_vendor])
|
OMPI_C_COMPILER_VENDOR([opal_c_vendor])
|
||||||
|
|
||||||
# Check for standard headers, needed here because needed before
|
# Check for standard headers, needed here because needed before
|
||||||
# the types checks.
|
# the types checks.
|
||||||
@ -62,7 +62,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
|
|||||||
# Don't use AC_GNU_SOURCE because it requires that no compiler
|
# Don't use AC_GNU_SOURCE because it requires that no compiler
|
||||||
# tests are done before setting it, and we need to at least do
|
# tests are done before setting it, and we need to at least do
|
||||||
# enough tests to figure out if we're using XL or not.
|
# enough tests to figure out if we're using XL or not.
|
||||||
AS_IF([test "$ompi_cv_c_compiler_vendor" != "ibm"],
|
AS_IF([test "$opal_cv_c_compiler_vendor" != "ibm"],
|
||||||
[AH_VERBATIM([_GNU_SOURCE],
|
[AH_VERBATIM([_GNU_SOURCE],
|
||||||
[/* Enable GNU extensions on systems that have them. */
|
[/* Enable GNU extensions on systems that have them. */
|
||||||
#ifndef _GNU_SOURCE
|
#ifndef _GNU_SOURCE
|
||||||
@ -72,7 +72,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
|
|||||||
|
|
||||||
# Do we want code coverage
|
# Do we want code coverage
|
||||||
if test "$WANT_COVERAGE" = "1"; then
|
if test "$WANT_COVERAGE" = "1"; then
|
||||||
if test "$ompi_c_vendor" = "gnu" ; then
|
if test "$opal_c_vendor" = "gnu" ; then
|
||||||
# For compilers > gcc-4.x, use --coverage for
|
# For compilers > gcc-4.x, use --coverage for
|
||||||
# compiling and linking to circumvent trouble with
|
# compiling and linking to circumvent trouble with
|
||||||
# libgcov.
|
# libgcov.
|
||||||
@ -116,7 +116,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
|
|||||||
|
|
||||||
# Do we want debugging?
|
# Do we want debugging?
|
||||||
if test "$WANT_DEBUG" = "1" -a "$enable_debug_symbols" != "no" ; then
|
if test "$WANT_DEBUG" = "1" -a "$enable_debug_symbols" != "no" ; then
|
||||||
if test "$ompi_c_vendor" = "gnu"; then
|
if test "$opal_c_vendor" = "gnu"; then
|
||||||
CFLAGS="$CFLAGS -g" # keep the -g3 for when it will become a standard option.
|
CFLAGS="$CFLAGS -g" # keep the -g3 for when it will become a standard option.
|
||||||
else
|
else
|
||||||
CFLAGS="$CFLAGS -g"
|
CFLAGS="$CFLAGS -g"
|
||||||
@ -129,7 +129,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
|
|||||||
# These flags are generally gcc-specific; even the
|
# These flags are generally gcc-specific; even the
|
||||||
# gcc-impersonating compilers won't accept them.
|
# gcc-impersonating compilers won't accept them.
|
||||||
OPAL_CFLAGS_BEFORE_PICKY="$CFLAGS"
|
OPAL_CFLAGS_BEFORE_PICKY="$CFLAGS"
|
||||||
if test "$WANT_PICKY_COMPILER" = 1 -a "$ompi_c_vendor" = "gnu" ; then
|
if test "$WANT_PICKY_COMPILER" = 1 -a "$opal_c_vendor" = "gnu" ; then
|
||||||
add="-Wall -Wundef -Wno-long-long -Wsign-compare"
|
add="-Wall -Wundef -Wno-long-long -Wsign-compare"
|
||||||
add="$add -Wmissing-prototypes -Wstrict-prototypes"
|
add="$add -Wmissing-prototypes -Wstrict-prototypes"
|
||||||
add="$add -Wcomment -pedantic"
|
add="$add -Wcomment -pedantic"
|
||||||
@ -219,7 +219,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
|
|||||||
|
|
||||||
# Try to enable restrict keyword
|
# Try to enable restrict keyword
|
||||||
RESTRICT_CFLAGS=
|
RESTRICT_CFLAGS=
|
||||||
case "$ompi_c_vendor" in
|
case "$opal_c_vendor" in
|
||||||
intel)
|
intel)
|
||||||
RESTRICT_CFLAGS="-restrict"
|
RESTRICT_CFLAGS="-restrict"
|
||||||
;;
|
;;
|
||||||
|
@ -33,12 +33,12 @@ AC_DEFUN([ORTE_SETUP_DEBUGGER_FLAGS],[
|
|||||||
CFLAGS_WITHOUT_OPTFLAGS="$s_result"
|
CFLAGS_WITHOUT_OPTFLAGS="$s_result"
|
||||||
# Tweak the compiler flags passed to orterun for Sun Studio SPARC
|
# Tweak the compiler flags passed to orterun for Sun Studio SPARC
|
||||||
# https://svn.open-mpi.org/trac/ompi/ticket/1448
|
# https://svn.open-mpi.org/trac/ompi/ticket/1448
|
||||||
if test "x$ompi_cv_c_compiler_vendor" = "xsun" -a -n "`echo $host | $GREP sparc`"; then
|
if test "x$opal_cv_c_compiler_vendor" = "xsun" -a -n "`echo $host | $GREP sparc`"; then
|
||||||
DEBUGGER_CFLAGS="-g -xO0"
|
DEBUGGER_CFLAGS="-g -xO0"
|
||||||
else
|
else
|
||||||
# Tweak the compiler flags passed for intel
|
# Tweak the compiler flags passed for intel
|
||||||
# to stop its aggressive inlining of functions
|
# to stop its aggressive inlining of functions
|
||||||
if test "x$ompi_cv_c_compiler_vendor" = "xintel"; then
|
if test "x$opal_cv_c_compiler_vendor" = "xintel"; then
|
||||||
DEBUGGER_CFLAGS="-g -O0"
|
DEBUGGER_CFLAGS="-g -O0"
|
||||||
else
|
else
|
||||||
DEBUGGER_CFLAGS="-g"
|
DEBUGGER_CFLAGS="-g"
|
||||||
|
@ -332,7 +332,7 @@ OPAL_SETUP_CC
|
|||||||
# If we build on a windows environment with the windows compiler and linker
|
# If we build on a windows environment with the windows compiler and linker
|
||||||
# then we need some translation functions from the opal/win32 directory.
|
# then we need some translation functions from the opal/win32 directory.
|
||||||
AM_CONDITIONAL(OMPI_NEED_WINDOWS_REPLACEMENTS,
|
AM_CONDITIONAL(OMPI_NEED_WINDOWS_REPLACEMENTS,
|
||||||
test "$ompi_cv_c_compiler_vendor" = "microsoft" )
|
test "$opal_cv_c_compiler_vendor" = "microsoft" )
|
||||||
|
|
||||||
# Do all Interix detections if necessary
|
# Do all Interix detections if necessary
|
||||||
OMPI_INTERIX
|
OMPI_INTERIX
|
||||||
@ -510,7 +510,7 @@ AC_C_INLINE
|
|||||||
# syntax, and the autoconf restrict detection is unable to detect them
|
# syntax, and the autoconf restrict detection is unable to detect them
|
||||||
# correctly. It detect the restrict keyword as __restrict which break the
|
# correctly. It detect the restrict keyword as __restrict which break the
|
||||||
# rules for function syntax which is declspec(restrict).
|
# rules for function syntax which is declspec(restrict).
|
||||||
if test "x$ompi_cv_c_compiler_vendor" != "xmicrosoft"; then
|
if test "x$opal_cv_c_compiler_vendor" != "xmicrosoft"; then
|
||||||
AC_C_RESTRICT
|
AC_C_RESTRICT
|
||||||
fi
|
fi
|
||||||
OMPI_C_WEAK_SYMBOLS
|
OMPI_C_WEAK_SYMBOLS
|
||||||
@ -1195,7 +1195,7 @@ opal_show_subtitle "Libtool configuration"
|
|||||||
|
|
||||||
# Use the undocumented solaris_use_stlport4 libtool variable to turn off any
|
# Use the undocumented solaris_use_stlport4 libtool variable to turn off any
|
||||||
# Cstd/stlport4 linkage. This allows Open MPI to be C++ STL agnostic.
|
# Cstd/stlport4 linkage. This allows Open MPI to be C++ STL agnostic.
|
||||||
if test "x$ompi_cv_c_compiler_vendor" = "xsun"; then
|
if test "x$opal_cv_c_compiler_vendor" = "xsun"; then
|
||||||
solaris_use_stlport4="yes"
|
solaris_use_stlport4="yes"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ AC_DEFUN([MCA_opal_memory_linux_CONFIG],[
|
|||||||
AS_IF([test "$memory_linux_ptmalloc2_happy" = yes],
|
AS_IF([test "$memory_linux_ptmalloc2_happy" = yes],
|
||||||
[case $host in
|
[case $host in
|
||||||
ia64-*)
|
ia64-*)
|
||||||
AS_IF([test "$ompi_c_vendor" = "intel"],
|
AS_IF([test "$opal_c_vendor" = "intel"],
|
||||||
[# check for v9.0 <= 20051201
|
[# check for v9.0 <= 20051201
|
||||||
icc_major_ver="`$CC --version | head -n 1 | awk '{ print [$]3 }'`"
|
icc_major_ver="`$CC --version | head -n 1 | awk '{ print [$]3 }'`"
|
||||||
icc_minor_ver="`$CC --version | head -n 1 | awk '{ print [$]4 }'`"
|
icc_minor_ver="`$CC --version | head -n 1 | awk '{ print [$]4 }'`"
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user