Commit 3072c5b8 authored by Yang Tse's avatar Yang Tse
Browse files

icc adjustments

parent ac1ab03c
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -3231,6 +3231,7 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
         dnl   which we know and do on purpose.
         dnl   which we know and do on purpose.


         WARN="-wd279,269,981,1418,1419"
         WARN="-wd279,269,981,1418,1419"
         WARN=""


         if test "$gccnum" -gt "600"; then
         if test "$gccnum" -gt "600"; then
            dnl icc 6.0 and older doesn't have the -Wall flag
            dnl icc 6.0 and older doesn't have the -Wall flag
+1 −0
Original line number Original line Diff line number Diff line
@@ -1892,6 +1892,7 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
         dnl   which we know and do on purpose.
         dnl   which we know and do on purpose.


         WARN="-wd279,269,981,1418,1419"
         WARN="-wd279,269,981,1418,1419"
         WARN=""


         if test "$gccnum" -gt "600"; then
         if test "$gccnum" -gt "600"; then
            dnl icc 6.0 and older doesn't have the -Wall flag
            dnl icc 6.0 and older doesn't have the -Wall flag
+6 −7
Original line number Original line Diff line number Diff line
@@ -167,13 +167,6 @@ esac
AC_MSG_RESULT($need_no_undefined)
AC_MSG_RESULT($need_no_undefined)
AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)


dnl **********************************************************************
dnl check if this is the Intel ICC compiler, and if so make it stricter
dnl (convert warning 147 into an error) so that it properly can detect the
dnl gethostbyname_r() version
dnl **********************************************************************
CURL_DETECT_ICC([CFLAGS="$CFLAGS -we 147"])

dnl **********************************************************************
dnl **********************************************************************
dnl platform/compiler/architecture specific checks/flags
dnl platform/compiler/architecture specific checks/flags
dnl **********************************************************************
dnl **********************************************************************
@@ -239,6 +232,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
  CFLAGS="$CFLAGS -std=c89"
  CFLAGS="$CFLAGS -std=c89"
  dnl Disable use of ANSI C aliasing rules in optimizations
  dnl Disable use of ANSI C aliasing rules in optimizations
  CFLAGS="$CFLAGS -no-ansi-alias"
  CFLAGS="$CFLAGS -no-ansi-alias"
  dnl Change some warnings into errors
  dnl #140: too many arguments in function call
  dnl #147: declaration is incompatible with 'previous one'
  dnl #165: too few arguments in function call
  dnl #266: function declared implicitly
  CFLAGS="$CFLAGS -we 140,147,165,266"
else
else
  AC_MSG_RESULT([no])
  AC_MSG_RESULT([no])
fi
fi
+6 −7
Original line number Original line Diff line number Diff line
@@ -306,6 +306,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
  CFLAGS="$CFLAGS -std=c89"
  CFLAGS="$CFLAGS -std=c89"
  dnl Disable use of ANSI C aliasing rules in optimizations
  dnl Disable use of ANSI C aliasing rules in optimizations
  CFLAGS="$CFLAGS -no-ansi-alias"
  CFLAGS="$CFLAGS -no-ansi-alias"
  dnl Change some warnings into errors
  dnl #140: too many arguments in function call
  dnl #147: declaration is incompatible with 'previous one'
  dnl #165: too few arguments in function call
  dnl #266: function declared implicitly
  CFLAGS="$CFLAGS -we 140,147,165,266"
else
else
  AC_MSG_RESULT([no])
  AC_MSG_RESULT([no])
fi
fi
@@ -541,13 +547,6 @@ AC_HELP_STRING([--disable-manual],[Disable built-in manual]),
dnl The actual use of the USE_MANUAL variable is done much later in this
dnl The actual use of the USE_MANUAL variable is done much later in this
dnl script to allow other actions to disable it as well.
dnl script to allow other actions to disable it as well.


dnl **********************************************************************
dnl check if this is the Intel ICC compiler, and if so make it stricter
dnl (convert warning 147 into an error) so that it properly can detect the
dnl gethostbyname_r() version
dnl **********************************************************************
CURL_DETECT_ICC([CFLAGS="$CFLAGS -we 147"])

dnl **********************************************************************
dnl **********************************************************************
dnl Checks for libraries.
dnl Checks for libraries.
dnl **********************************************************************
dnl **********************************************************************