Mercurial > hg > nginx
comparison auto/cc/icc @ 4444:2d3fc637fc48 stable-1.0
Merge of r4396:
Some questionable optomizations flags for icc were removed
in order to simplify support of its future versions.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 05 Feb 2012 19:05:06 +0000 |
parents | d2adfc714819 |
children | d620f497c50f |
comparison
equal
deleted
inserted
replaced
4443:f9b3061e0f31 | 4444:2d3fc637fc48 |
---|---|
1 | 1 |
2 # Copyright (C) Igor Sysoev | 2 # Copyright (C) Igor Sysoev |
3 | 3 |
4 | 4 |
5 # Intel C++ compiler 7.1, 8.0, 8.1, 9.0 | 5 # Intel C++ compiler 7.1, 8.0, 8.1, 9.0, 11.1 |
6 | 6 |
7 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ | 7 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ |
8 | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'` | 8 | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'` |
9 | 9 |
10 echo " + icc version: $NGX_ICC_VER" | 10 echo " + icc version: $NGX_ICC_VER" |
13 | 13 |
14 | 14 |
15 # optimizations | 15 # optimizations |
16 | 16 |
17 CFLAGS="$CFLAGS -O" | 17 CFLAGS="$CFLAGS -O" |
18 # inline the functions declared with __inline | |
19 #CFLAGS="$CFLAGS -Ob1" | |
20 # inline any function, at the compiler's discretion | |
21 CFLAGS="$CFLAGS -Ob2" | |
22 | 18 |
23 # multi-file IP optimizations | |
24 case "$NGX_ICC_VER" in | |
25 9.*) | |
26 IPO="-ipo" | |
27 ;; | |
28 | |
29 # 8.1.38 under FreeBSD can not link -ipo | |
30 8.1) | |
31 IPO="-ip" | |
32 ;; | |
33 | |
34 *) | |
35 IPO="-ipo -ipo_obj" | |
36 ;; | |
37 esac | |
38 | |
39 # single-file IP optimizations | |
40 #IPO="-ip" | |
41 | |
42 CFLAGS="$CFLAGS $IPO" | |
43 CORE_LINK="$CORE_LINK $IPO" | |
44 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" | 19 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" |
45 | 20 |
46 | 21 |
47 case $CPU in | 22 case $CPU in |
48 pentium) | 23 pentium) |
62 esac | 37 esac |
63 | 38 |
64 CFLAGS="$CFLAGS $CPU_OPT" | 39 CFLAGS="$CFLAGS $CPU_OPT" |
65 | 40 |
66 if [ ".$PCRE_OPT" = "." ]; then | 41 if [ ".$PCRE_OPT" = "." ]; then |
67 PCRE_OPT="-O $IPO $CPU_OPT" | 42 PCRE_OPT="-O $CPU_OPT" |
68 fi | 43 fi |
69 | 44 |
70 if [ ".$MD5_OPT" = "." ]; then | 45 if [ ".$MD5_OPT" = "." ]; then |
71 MD5_OPT="-O $IPO $CPU_OPT" | 46 MD5_OPT="-O $CPU_OPT" |
72 fi | 47 fi |
73 | 48 |
74 if [ ".$ZLIB_OPT" = "." ]; then | 49 if [ ".$ZLIB_OPT" = "." ]; then |
75 ZLIB_OPT="-O $IPO $CPU_OPT" | 50 ZLIB_OPT="-O $CPU_OPT" |
76 fi | 51 fi |
77 | 52 |
78 | 53 |
79 # warnings | 54 # warnings |
80 | 55 |