annotate auto/cc/icc @ 660:d0f7a625f27c NGINX_1_1_14

nginx 1.1.14 *) Feature: multiple "limit_req" limits may be used simultaneously. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "proxy_redirect" directives might not be correctly inherited. *) Bugfix: memory leak during reconfiguration if the "pcre_jit" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jan 2012 00:00:00 +0400
parents 5a4401b9551b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
660
d0f7a625f27c nginx 1.1.14
Igor Sysoev <http://sysoev.ru>
parents: 658
diff changeset
3 # Copyright (C) Nginx, Inc.
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5
658
5a4401b9551b nginx 1.1.13
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
6 # Intel C++ compiler 7.1, 8.0, 8.1, 9.0, 11.1
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
8 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
296
2ceaee987f37 nginx 0.5.18
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
9 | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'`
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
10
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
11 echo " + icc version: $NGX_ICC_VER"
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
12
106
45f7329b4bd0 nginx 0.3.0
Igor Sysoev <http://sysoev.ru>
parents: 104
diff changeset
13 have=NGX_COMPILER value="\"Intel C Compiler $NGX_ICC_VER\"" . auto/define
45f7329b4bd0 nginx 0.3.0
Igor Sysoev <http://sysoev.ru>
parents: 104
diff changeset
14
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
15
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 # optimizations
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 CFLAGS="$CFLAGS -O"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19
18
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
20 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
22
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23 case $CPU in
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 pentium)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 # optimize for Pentium and Athlon
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 CPU_OPT="-march=pentium"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27 ;;
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 pentiumpro)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 # optimize for Pentium Pro, Pentium II and Pentium III
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 CPU_OPT="-mcpu=pentiumpro -march=pentiumpro"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 ;;
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34 pentium4)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 # optimize for Pentium 4, default
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 CPU_OPT="-march=pentium4"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 ;;
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 esac
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 CFLAGS="$CFLAGS $CPU_OPT"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 if [ ".$PCRE_OPT" = "." ]; then
658
5a4401b9551b nginx 1.1.13
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
43 PCRE_OPT="-O $CPU_OPT"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44 fi
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46 if [ ".$MD5_OPT" = "." ]; then
658
5a4401b9551b nginx 1.1.13
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
47 MD5_OPT="-O $CPU_OPT"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 fi
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 if [ ".$ZLIB_OPT" = "." ]; then
658
5a4401b9551b nginx 1.1.13
Igor Sysoev <http://sysoev.ru>
parents: 296
diff changeset
51 ZLIB_OPT="-O $CPU_OPT"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 fi
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55 # warnings
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
57 CFLAGS="$CFLAGS -w2"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
58
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
59 # disable some warnings
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
61 # invalid type conversion: "int" to "char *"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
62 CFLAGS="$CFLAGS -wd171"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
63 # argument is incompatible with corresponding format string conversion
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
64 CFLAGS="$CFLAGS -wd181"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
65 # zero used for undefined preprocessing identifier
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
66 CFLAGS="$CFLAGS -wd193"
112
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
67 # the format string ends before this argument
68
056fd0e5a5a6 nginx 0.1.34
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
68 CFLAGS="$CFLAGS -wd268"
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
69 # invalid format string conversion
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
70 CFLAGS="$CFLAGS -wd269"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
71 # conversion from "long long" to "size_t" may lose significant bits
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
72 CFLAGS="$CFLAGS -wd810"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
73 # parameter was never referenced
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
74 CFLAGS="$CFLAGS -wd869"
230
38e7b94d63ac nginx 0.4.0
Igor Sysoev <http://sysoev.ru>
parents: 150
diff changeset
75 # attribute "unused" is only allowed in a function definition, warning on pTHX_
38e7b94d63ac nginx 0.4.0
Igor Sysoev <http://sysoev.ru>
parents: 150
diff changeset
76 CFLAGS="$CFLAGS -wd1301"
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
77
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
78 # STUB
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
79 # enumerated type mixed with another type
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
80 CFLAGS="$CFLAGS -wd188"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
81 # controlling expression is constant
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
82 CFLAGS="$CFLAGS -wd279"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
83 # operands are evaluated in unspecified order
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
84 CFLAGS="$CFLAGS -wd981"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
85 # external definition with no prior declaration
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
86 CFLAGS="$CFLAGS -wd1418"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
87 # external declaration in primary source file
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
88 CFLAGS="$CFLAGS -wd1419"
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
89
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
90 case "$NGX_ICC_VER" in
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
91 9.*)
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 122
diff changeset
92 # "cc" clobber ignored, warnings for Liunx's htonl()/htons()
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
93 CFLAGS="$CFLAGS -wd1469"
112
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
94 # explicit conversion of a 64-bit integral type to a smaller
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
95 # integral type
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
96 CFLAGS="$CFLAGS -wd1683"
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
97 # conversion from pointer to same-sized integral type,
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
98 # warning on offsetof()
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
99 CFLAGS="$CFLAGS -wd1684"
144
e1c6ac408b68 nginx 0.3.19
Igor Sysoev <http://sysoev.ru>
parents: 138
diff changeset
100 # floating-point equality and inequality comparisons are unreliable,
e1c6ac408b68 nginx 0.3.19
Igor Sysoev <http://sysoev.ru>
parents: 138
diff changeset
101 # warning on SvTRUE()
e1c6ac408b68 nginx 0.3.19
Igor Sysoev <http://sysoev.ru>
parents: 138
diff changeset
102 CFLAGS="$CFLAGS -wd1572"
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
103 ;;
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
104
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
105 8.*)
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 122
diff changeset
106 # "cc" clobber ignored, warnings for Liunx's htonl()/htons()
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
107 CFLAGS="$CFLAGS -wd1469"
144
e1c6ac408b68 nginx 0.3.19
Igor Sysoev <http://sysoev.ru>
parents: 138
diff changeset
108 # floating-point equality and inequality comparisons are unreliable,
e1c6ac408b68 nginx 0.3.19
Igor Sysoev <http://sysoev.ru>
parents: 138
diff changeset
109 # warning on SvTRUE()
e1c6ac408b68 nginx 0.3.19
Igor Sysoev <http://sysoev.ru>
parents: 138
diff changeset
110 CFLAGS="$CFLAGS -wd1572"
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
111 ;;
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
112
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
113 *)
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
114 ;;
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
115 esac
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
116
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
117 # stop on warning
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
118 CFLAGS="$CFLAGS -Werror"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
119
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
120 # debug
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
121 CFLAGS="$CFLAGS -g"