diff options
Diffstat (limited to 'auto/cc')
| -rw-r--r-- | auto/cc/gcc | 7 | ||||
| -rw-r--r-- | auto/cc/icc | 24 |
2 files changed, 26 insertions, 5 deletions
diff --git a/auto/cc/gcc b/auto/cc/gcc index 2e5906a75..c5db85885 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -4,7 +4,7 @@ # gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2 # 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4.0, 3.4.2 -# 4.0.0 +# 4.0.0, 4.0.1, 4.1.0 NGX_GCC_VER=`$CC -v 2>&1 | grep 'gcc version' 2>&1 \ @@ -57,6 +57,11 @@ case $CPU in CPU_OPT="-march=pentium4" ;; + athlon) + # optimize for Athlon, gcc 3.x + CPU_OPT="-march=athlon" + ;; + opteron) # optimize for Opteron, gcc 3.x CPU_OPT="-march=opteron" diff --git a/auto/cc/icc b/auto/cc/icc index a0f676e6d..1c59c5561 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -4,6 +4,12 @@ # Intel C++ compiler 7.1, 8.0, 8.1 +NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ + | sed -e 's/^.* Version \(.*\) Build.*$/\1/'` + +echo " + icc version: $NGX_ICC_VER" + + # optimizations CFLAGS="$CFLAGS -O" @@ -72,8 +78,6 @@ CFLAGS="$CFLAGS -wd269" CFLAGS="$CFLAGS -wd810" # parameter was never referenced CFLAGS="$CFLAGS -wd869" -# "cc" clobber ignored, warnings for Liunx's htons() -CFLAGS="$CFLAGS -wd1469" # STUB # enumerated type mixed with another type @@ -86,8 +90,20 @@ CFLAGS="$CFLAGS -wd981" CFLAGS="$CFLAGS -wd1418" # external declaration in primary source file CFLAGS="$CFLAGS -wd1419" -# non-POD class type passed through ellipsis -CFLAGS="$CFLAGS -wd1595" + +case "$NGX_ICC_VER" in + 8.*) + # "cc" clobber ignored, warnings for Liunx's htons() + CFLAGS="$CFLAGS -wd1469" + + # STUB + # non-POD class type passed through ellipsis + CFLAGS="$CFLAGS -wd1595" + ;; + + *) + ;; +esac # stop on warning CFLAGS="$CFLAGS -Werror" |