diff options
Diffstat (limited to 'auto/cc')
| -rw-r--r-- | auto/cc/gcc | 4 | ||||
| -rw-r--r-- | auto/cc/icc | 24 | ||||
| -rw-r--r-- | auto/cc/name | 18 |
3 files changed, 30 insertions, 16 deletions
diff --git a/auto/cc/gcc b/auto/cc/gcc index af279fa43..17bb13883 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -37,7 +37,7 @@ fi case "$NGX_PLATFORM" in *:sun4u) - # "-mcpu=v9" enables the "casxa" assembler instruction + # "-mcpu=v9" enables the "casa" assembler instruction CFLAGS="$CFLAGS -mcpu=v9" ;; @@ -134,6 +134,8 @@ case "$NGX_GCC_VER" in # we have a lot of the unused function arguments CFLAGS="$CFLAGS -Wno-unused-parameter" CFLAGS="$CFLAGS -Wno-unused-function" + CFLAGS="$CFLAGS -Wunused-variable" + CFLAGS="$CFLAGS -Wunused-value" #CFLAGS="$CFLAGS -Wunreachable-code" ;; diff --git a/auto/cc/icc b/auto/cc/icc index 0aa975ed2..d3a151c6e 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -22,8 +22,18 @@ CFLAGS="$CFLAGS -Ob2" # single-file IP optimizations #IPO="-ip" + # multi-file IP optimizations -IPO="-ipo -ipo_obj" +case "$NGX_ICC_VER" in + 9.*) + IPO="-ipo" + ;; + + *) + IPO="-ipo -ipo_obj" + ;; +esac + CFLAGS="$CFLAGS $IPO" CORE_LINK="$CORE_LINK $IPO" CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" @@ -72,7 +82,7 @@ CFLAGS="$CFLAGS -wd171" CFLAGS="$CFLAGS -wd181" # zero used for undefined preprocessing identifier CFLAGS="$CFLAGS -wd193" -#the format string ends before this argument +# the format string ends before this argument CFLAGS="$CFLAGS -wd268" # invalid format string conversion CFLAGS="$CFLAGS -wd269" @@ -92,15 +102,17 @@ CFLAGS="$CFLAGS -wd981" CFLAGS="$CFLAGS -wd1418" # external declaration in primary source file CFLAGS="$CFLAGS -wd1419" -# explicit conversion of a 64-bit integral type to a smaller integral type -CFLAGS="$CFLAGS -wd1683" -# conversion from pointer to same-sized integral type, warning on offsetof() -CFLAGS="$CFLAGS -wd1684" case "$NGX_ICC_VER" in 8.* | 9.*) # "cc" clobber ignored, warnings for Liunx's htons() CFLAGS="$CFLAGS -wd1469" + # explicit conversion of a 64-bit integral type to a smaller + # integral type + CFLAGS="$CFLAGS -wd1683" + # conversion from pointer to same-sized integral type, + # warning on offsetof() + CFLAGS="$CFLAGS -wd1684" # STUB # non-POD class type passed through ellipsis, Linux only ? diff --git a/auto/cc/name b/auto/cc/name index faa329075..7202aaa26 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -11,47 +11,47 @@ if [ $CC = cl ]; then 2>&1 >/dev/null`; then NGX_CC_NAME=msvc7 - echo " using Microsoft Visual C++ 7 compiler" + echo " Microsoft Visual C++ 7 compiler" else NGX_CC_NAME=msvc - echo " using Microsoft Visual C++ compiler" + echo " Microsoft Visual C++ compiler" fi else if [ $CC = wcl386 ]; then NGX_CC_NAME=owc - echo " using Open Watcom C compiler" + echo " Open Watcom C compiler" else if [ $CC = bcc32 ]; then NGX_CC_NAME=bcc - echo " using Borland C++ compiler" + echo " Borland C++ compiler" else if `$CC -v 2>&1 | grep 'gcc version' 2>&1 >/dev/null`; then NGX_CC_NAME=gcc - echo " using GNU C compiler" + echo " GNU C compiler" else if `$CC -V 2>&1 | grep '^Intel(R) C' 2>&1 >/dev/null`; then NGX_CC_NAME=icc - echo " using Intel C++ compiler" + echo " Intel C++ compiler" else if `$CC -V 2>&1 | grep 'Sun C' 2>&1 >/dev/null`; then NGX_CC_NAME=sunc - echo " using Sun C compiler" + echo " Sun C compiler" else if `$CC -V 2>&1 | grep '^Compaq C' 2>&1 >/dev/null`; then NGX_CC_NAME=ccc - echo " using Compaq C compiler" + echo " Compaq C compiler" else if `$CC -V 2>&1 | grep '^aCC: ' 2>&1 >/dev/null`; then NGX_CC_NAME=acc - echo " using HP aC++ compiler" + echo " HP aC++ compiler" else NGX_CC_NAME=unknown |