icc permanent adjustment:

Select precise floating-point model, otherwise doubles are less than 64-bit wide

icc test adjustment:

  Select c89 dialect
This commit is contained in:
Yang Tse
2008-10-24 11:27:09 +00:00
parent 6ea91af2f8
commit 2b77d50776
2 changed files with 80 additions and 76 deletions

View File

@@ -16,7 +16,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 42 # serial 43
dnl CARES_CHECK_COMPILER dnl CARES_CHECK_COMPILER
@@ -185,6 +185,7 @@ AC_DEFUN([CARES_CHECK_COMPILER_INTEL_C], [
CURL_CHECK_DEF([__INTEL_COMPILER], [], [silent]) CURL_CHECK_DEF([__INTEL_COMPILER], [], [silent])
if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
compiler_num="$curl_cv_def___INTEL_COMPILER"
CURL_CHECK_DEF([__i386__], [], [silent]) CURL_CHECK_DEF([__i386__], [], [silent])
CURL_CHECK_DEF([__unix__], [], [silent]) CURL_CHECK_DEF([__unix__], [], [silent])
if test "$curl_cv_have_def___unix__" = "yes"; then if test "$curl_cv_have_def___unix__" = "yes"; then
@@ -218,7 +219,6 @@ AC_DEFUN([CARES_CHECK_COMPILER_INTEL_C], [
flags_opt_yes="/O2" flags_opt_yes="/O2"
flags_opt_off="/Od" flags_opt_off="/Od"
fi fi
compiler_num="$curl_cv_def___INTEL_COMPILER"
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
@@ -559,7 +559,9 @@ AC_DEFUN([CARES_SET_COMPILER_BASIC_OPTS], [
# #
dnl On unix this compiler uses gcc's header files, so dnl On unix this compiler uses gcc's header files, so
dnl we select ANSI C89 dialect plus GNU extensions. dnl we select ANSI C89 dialect plus GNU extensions.
tmp_CPPFLAGS="$tmp_CPPFLAGS -std=gnu89" dnl tmp_CFLAGS="$tmp_CFLAGS -std=gnu89"
dnl Select ANSI C89 dialect without GNU extensions.
tmp_CFLAGS="$tmp_CFLAGS -std=c89"
dnl Change some warnings into errors dnl Change some warnings into errors
dnl #140: too many arguments in function call dnl #140: too many arguments in function call
dnl #147: declaration is incompatible with 'previous one' dnl #147: declaration is incompatible with 'previous one'
@@ -942,41 +944,41 @@ AC_DEFUN([CARES_SET_COMPILER_WARNING_OPTS], [
dnl Warn if a declared function is not used dnl Warn if a declared function is not used
tmp_CPPFLAGS="$tmp_CPPFLAGS -Wunused-function" tmp_CPPFLAGS="$tmp_CPPFLAGS -Wunused-function"
fi fi
dnl Disable using EBP register in optimizations fi
tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer" dnl Disable using EBP register in optimizations
dnl Disable use of ANSI C aliasing rules in optimizations tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer"
tmp_CFLAGS="$tmp_CFLAGS -no-ansi-alias" dnl Disable use of ANSI C aliasing rules in optimizations
dnl Disable some optimizations to debug icc 9.1 SIGSEGV tmp_CFLAGS="$tmp_CFLAGS -no-ansi-alias"
if test "$INTEL_UNIX_C_OPT_SIGSEGV" = "yes"; then dnl Value-safe optimizations on floating-point data
dnl Disable inlining of user-defined functions tmp_CFLAGS="$tmp_CFLAGS -fp-model precise"
tmp_CFLAGS="$tmp_CFLAGS -Ob0" dnl Disable some optimizations to debug icc 9.1 SIGSEGV
dnl Disable inline expansion of intrinsic functions if test "$INTEL_UNIX_C_OPT_SIGSEGV" = "yes"; then
tmp_CFLAGS="$tmp_CFLAGS -fno-builtin" dnl Disable inlining of user-defined functions
dnl Disable inlining of functions tmp_CFLAGS="$tmp_CFLAGS -Ob0"
tmp_CFLAGS="$tmp_CFLAGS -fno-inline" dnl Disable inline expansion of intrinsic functions
dnl Disable some IPO for single file optimizations tmp_CFLAGS="$tmp_CFLAGS -fno-builtin"
tmp_CFLAGS="$tmp_CFLAGS -fno-inline-functions" dnl Disable inlining of functions
dnl Disable inlining of standard library functions tmp_CFLAGS="$tmp_CFLAGS -fno-inline"
tmp_CFLAGS="$tmp_CFLAGS -nolib-inline" dnl Disable some IPO for single file optimizations
dnl Disable full and partial inlining when IPO tmp_CFLAGS="$tmp_CFLAGS -fno-inline-functions"
tmp_CFLAGS="$tmp_CFLAGS -ip-no-inlining" dnl Disable inlining of standard library functions
dnl Enable floating-point stack integrity checks tmp_CFLAGS="$tmp_CFLAGS -nolib-inline"
tmp_CFLAGS="$tmp_CFLAGS -fpstkchk" dnl Disable full and partial inlining when IPO
dnl Enable run-time detection of buffer overruns. tmp_CFLAGS="$tmp_CFLAGS -ip-no-inlining"
tmp_CFLAGS="$tmp_CFLAGS -fstack-security-check" dnl Enable floating-point stack integrity checks
dnl Disable floating point optimizations tmp_CFLAGS="$tmp_CFLAGS -fpstkchk"
tmp_CFLAGS="$tmp_CFLAGS -fp-model precise" dnl Enable run-time detection of buffer overruns.
dnl Assume aliasing in the program. tmp_CFLAGS="$tmp_CFLAGS -fstack-security-check"
tmp_CFLAGS="$tmp_CFLAGS -falias" dnl Assume aliasing in the program.
dnl Assume that arguments may be aliased. tmp_CFLAGS="$tmp_CFLAGS -falias"
tmp_CFLAGS="$tmp_CFLAGS -alias-args" dnl Assume that arguments may be aliased.
dnl Assume aliasing within functions tmp_CFLAGS="$tmp_CFLAGS -alias-args"
tmp_CFLAGS="$tmp_CFLAGS -ffnalias" dnl Assume aliasing within functions
dnl Disable prefetch insertion optimization tmp_CFLAGS="$tmp_CFLAGS -ffnalias"
tmp_CFLAGS="$tmp_CFLAGS -no-prefetch" dnl Disable prefetch insertion optimization
dnl Disable loop unrolling optimization tmp_CFLAGS="$tmp_CFLAGS -no-prefetch"
tmp_CFLAGS="$tmp_CFLAGS -unroll0" dnl Disable loop unrolling optimization
fi tmp_CFLAGS="$tmp_CFLAGS -unroll0"
fi fi
;; ;;
# #

View File

@@ -22,7 +22,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 41 # serial 42
dnl CURL_CHECK_COMPILER dnl CURL_CHECK_COMPILER
@@ -191,6 +191,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_INTEL_C], [
CURL_CHECK_DEF([__INTEL_COMPILER], [], [silent]) CURL_CHECK_DEF([__INTEL_COMPILER], [], [silent])
if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
compiler_num="$curl_cv_def___INTEL_COMPILER"
CURL_CHECK_DEF([__i386__], [], [silent]) CURL_CHECK_DEF([__i386__], [], [silent])
CURL_CHECK_DEF([__unix__], [], [silent]) CURL_CHECK_DEF([__unix__], [], [silent])
if test "$curl_cv_have_def___unix__" = "yes"; then if test "$curl_cv_have_def___unix__" = "yes"; then
@@ -224,7 +225,6 @@ AC_DEFUN([CURL_CHECK_COMPILER_INTEL_C], [
flags_opt_yes="/O2" flags_opt_yes="/O2"
flags_opt_off="/Od" flags_opt_off="/Od"
fi fi
compiler_num="$curl_cv_def___INTEL_COMPILER"
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
@@ -565,7 +565,9 @@ AC_DEFUN([CURL_SET_COMPILER_BASIC_OPTS], [
# #
dnl On unix this compiler uses gcc's header files, so dnl On unix this compiler uses gcc's header files, so
dnl we select ANSI C89 dialect plus GNU extensions. dnl we select ANSI C89 dialect plus GNU extensions.
tmp_CPPFLAGS="$tmp_CPPFLAGS -std=gnu89" dnl tmp_CFLAGS="$tmp_CFLAGS -std=gnu89"
dnl Select ANSI C89 dialect without GNU extensions.
tmp_CFLAGS="$tmp_CFLAGS -std=c89"
dnl Change some warnings into errors dnl Change some warnings into errors
dnl #140: too many arguments in function call dnl #140: too many arguments in function call
dnl #147: declaration is incompatible with 'previous one' dnl #147: declaration is incompatible with 'previous one'
@@ -948,41 +950,41 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
dnl Warn if a declared function is not used dnl Warn if a declared function is not used
tmp_CPPFLAGS="$tmp_CPPFLAGS -Wunused-function" tmp_CPPFLAGS="$tmp_CPPFLAGS -Wunused-function"
fi fi
dnl Disable using EBP register in optimizations fi
tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer" dnl Disable using EBP register in optimizations
dnl Disable use of ANSI C aliasing rules in optimizations tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer"
tmp_CFLAGS="$tmp_CFLAGS -no-ansi-alias" dnl Disable use of ANSI C aliasing rules in optimizations
dnl Disable some optimizations to debug icc 9.1 SIGSEGV tmp_CFLAGS="$tmp_CFLAGS -no-ansi-alias"
if test "$INTEL_UNIX_C_OPT_SIGSEGV" = "yes"; then dnl Value-safe optimizations on floating-point data
dnl Disable inlining of user-defined functions tmp_CFLAGS="$tmp_CFLAGS -fp-model precise"
tmp_CFLAGS="$tmp_CFLAGS -Ob0" dnl Disable some optimizations to debug icc 9.1 SIGSEGV
dnl Disable inline expansion of intrinsic functions if test "$INTEL_UNIX_C_OPT_SIGSEGV" = "yes"; then
tmp_CFLAGS="$tmp_CFLAGS -fno-builtin" dnl Disable inlining of user-defined functions
dnl Disable inlining of functions tmp_CFLAGS="$tmp_CFLAGS -Ob0"
tmp_CFLAGS="$tmp_CFLAGS -fno-inline" dnl Disable inline expansion of intrinsic functions
dnl Disable some IPO for single file optimizations tmp_CFLAGS="$tmp_CFLAGS -fno-builtin"
tmp_CFLAGS="$tmp_CFLAGS -fno-inline-functions" dnl Disable inlining of functions
dnl Disable inlining of standard library functions tmp_CFLAGS="$tmp_CFLAGS -fno-inline"
tmp_CFLAGS="$tmp_CFLAGS -nolib-inline" dnl Disable some IPO for single file optimizations
dnl Disable full and partial inlining when IPO tmp_CFLAGS="$tmp_CFLAGS -fno-inline-functions"
tmp_CFLAGS="$tmp_CFLAGS -ip-no-inlining" dnl Disable inlining of standard library functions
dnl Enable floating-point stack integrity checks tmp_CFLAGS="$tmp_CFLAGS -nolib-inline"
tmp_CFLAGS="$tmp_CFLAGS -fpstkchk" dnl Disable full and partial inlining when IPO
dnl Enable run-time detection of buffer overruns. tmp_CFLAGS="$tmp_CFLAGS -ip-no-inlining"
tmp_CFLAGS="$tmp_CFLAGS -fstack-security-check" dnl Enable floating-point stack integrity checks
dnl Disable floating point optimizations tmp_CFLAGS="$tmp_CFLAGS -fpstkchk"
tmp_CFLAGS="$tmp_CFLAGS -fp-model precise" dnl Enable run-time detection of buffer overruns.
dnl Assume aliasing in the program. tmp_CFLAGS="$tmp_CFLAGS -fstack-security-check"
tmp_CFLAGS="$tmp_CFLAGS -falias" dnl Assume aliasing in the program.
dnl Assume that arguments may be aliased. tmp_CFLAGS="$tmp_CFLAGS -falias"
tmp_CFLAGS="$tmp_CFLAGS -alias-args" dnl Assume that arguments may be aliased.
dnl Assume aliasing within functions tmp_CFLAGS="$tmp_CFLAGS -alias-args"
tmp_CFLAGS="$tmp_CFLAGS -ffnalias" dnl Assume aliasing within functions
dnl Disable prefetch insertion optimization tmp_CFLAGS="$tmp_CFLAGS -ffnalias"
tmp_CFLAGS="$tmp_CFLAGS -no-prefetch" dnl Disable prefetch insertion optimization
dnl Disable loop unrolling optimization tmp_CFLAGS="$tmp_CFLAGS -no-prefetch"
tmp_CFLAGS="$tmp_CFLAGS -unroll0" dnl Disable loop unrolling optimization
fi tmp_CFLAGS="$tmp_CFLAGS -unroll0"
fi fi
;; ;;
# #