summaryrefslogtreecommitdiff
path: root/auto/cc/icc
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2012-01-16 16:04:03 +0000
committerJonathan Kolb <jon@b0g.us>2012-01-16 16:04:03 +0000
commitb61802612732d1211d92a3a4f449fb4cd1d80d18 (patch)
treeeef24b3adee50cc2f69ed303118cf0605e94b96d /auto/cc/icc
parent009625684c294b0d8512d4dc70749d88b161de25 (diff)
downloadnginx-b61802612732d1211d92a3a4f449fb4cd1d80d18.tar.gz
Changes with nginx 1.1.13 16 Jan 2012v1.1.13
*) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the "ssl_protocols" directive. *) Bugfix: the "limit_req" directive parameters were not inherited correctly; the bug had appeared in 1.1.12. *) Bugfix: the "proxy_redirect" directive incorrectly processed "Refresh" header if regular expression were used. *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter did not return answer from cache if there were no live upstreams. *) Bugfix: the "worker_cpu_affinity" directive might not work. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.1.12. *) Bugfix: in the ngx_http_mp4_module. Maxim Dounin _______________________________________________ nginx-announce mailing list nginx-announce@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-announce
Diffstat (limited to 'auto/cc/icc')
-rw-r--r--auto/cc/icc33
1 files changed, 4 insertions, 29 deletions
diff --git a/auto/cc/icc b/auto/cc/icc
index 91dd95ecf..77cf180df 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -2,7 +2,7 @@
# Copyright (C) Igor Sysoev
-# Intel C++ compiler 7.1, 8.0, 8.1, 9.0
+# Intel C++ compiler 7.1, 8.0, 8.1, 9.0, 11.1
NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
| sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'`
@@ -15,32 +15,7 @@ have=NGX_COMPILER value="\"Intel C Compiler $NGX_ICC_VER\"" . auto/define
# optimizations
CFLAGS="$CFLAGS -O"
-# inline the functions declared with __inline
-#CFLAGS="$CFLAGS -Ob1"
-# inline any function, at the compiler's discretion
-CFLAGS="$CFLAGS -Ob2"
-# multi-file IP optimizations
-case "$NGX_ICC_VER" in
- 9.*)
- IPO="-ipo"
- ;;
-
- # 8.1.38 under FreeBSD can not link -ipo
- 8.1)
- IPO="-ip"
- ;;
-
- *)
- IPO="-ipo -ipo_obj"
- ;;
-esac
-
-# single-file IP optimizations
-#IPO="-ip"
-
-CFLAGS="$CFLAGS $IPO"
-CORE_LINK="$CORE_LINK $IPO"
CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"
@@ -64,15 +39,15 @@ esac
CFLAGS="$CFLAGS $CPU_OPT"
if [ ".$PCRE_OPT" = "." ]; then
- PCRE_OPT="-O $IPO $CPU_OPT"
+ PCRE_OPT="-O $CPU_OPT"
fi
if [ ".$MD5_OPT" = "." ]; then
- MD5_OPT="-O $IPO $CPU_OPT"
+ MD5_OPT="-O $CPU_OPT"
fi
if [ ".$ZLIB_OPT" = "." ]; then
- ZLIB_OPT="-O $IPO $CPU_OPT"
+ ZLIB_OPT="-O $CPU_OPT"
fi