Mercurial > hg > nginx
annotate auto/cc/icc @ 4448:539355d9e675 stable-1.0
Merge of r4404:
Fixed sched_setaffinity(2) to correctly pass size.
Second argument (cpusetsize) is size in bytes, not in bits. Previously
used constant 32 resulted in reading of uninitialized memory and caused
EINVAL to be returned on some Linux kernels.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sun, 05 Feb 2012 19:25:24 +0000 |
| parents | 2d3fc637fc48 |
| children | d620f497c50f |
| rev | line source |
|---|---|
| 455 | 1 |
| 2 # Copyright (C) Igor Sysoev | |
| 3 | |
| 4 | |
| 4444 | 5 # Intel C++ compiler 7.1, 8.0, 8.1, 9.0, 11.1 |
| 455 | 6 |
| 521 | 7 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ |
|
1170
5e878722ad57
remove trailing space in icc version
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
8 | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'` |
| 521 | 9 |
| 10 echo " + icc version: $NGX_ICC_VER" | |
| 11 | |
| 557 | 12 have=NGX_COMPILER value="\"Intel C Compiler $NGX_ICC_VER\"" . auto/define |
| 13 | |
| 521 | 14 |
| 455 | 15 # optimizations |
| 16 | |
| 17 CFLAGS="$CFLAGS -O" | |
| 18 | |
| 469 | 19 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" |
| 455 | 20 |
| 573 | 21 |
| 455 | 22 case $CPU in |
| 23 pentium) | |
| 24 # optimize for Pentium and Athlon | |
| 25 CPU_OPT="-march=pentium" | |
| 26 ;; | |
| 27 | |
| 28 pentiumpro) | |
| 29 # optimize for Pentium Pro, Pentium II and Pentium III | |
| 30 CPU_OPT="-mcpu=pentiumpro -march=pentiumpro" | |
| 31 ;; | |
| 32 | |
| 33 pentium4) | |
| 34 # optimize for Pentium 4, default | |
| 35 CPU_OPT="-march=pentium4" | |
| 36 ;; | |
| 37 esac | |
| 38 | |
| 39 CFLAGS="$CFLAGS $CPU_OPT" | |
| 40 | |
| 41 if [ ".$PCRE_OPT" = "." ]; then | |
| 4444 | 42 PCRE_OPT="-O $CPU_OPT" |
| 455 | 43 fi |
| 44 | |
| 45 if [ ".$MD5_OPT" = "." ]; then | |
| 4444 | 46 MD5_OPT="-O $CPU_OPT" |
| 455 | 47 fi |
| 48 | |
| 49 if [ ".$ZLIB_OPT" = "." ]; then | |
| 4444 | 50 ZLIB_OPT="-O $CPU_OPT" |
| 455 | 51 fi |
| 52 | |
| 53 | |
| 54 # warnings | |
| 55 | |
| 501 | 56 CFLAGS="$CFLAGS -w2" |
| 57 | |
| 58 # disable some warnings | |
| 455 | 59 |
| 501 | 60 # invalid type conversion: "int" to "char *" |
| 61 CFLAGS="$CFLAGS -wd171" | |
| 62 # argument is incompatible with corresponding format string conversion | |
| 63 CFLAGS="$CFLAGS -wd181" | |
| 64 # zero used for undefined preprocessing identifier | |
| 65 CFLAGS="$CFLAGS -wd193" | |
| 563 | 66 # the format string ends before this argument |
| 519 | 67 CFLAGS="$CFLAGS -wd268" |
| 501 | 68 # invalid format string conversion |
| 69 CFLAGS="$CFLAGS -wd269" | |
| 70 # conversion from "long long" to "size_t" may lose significant bits | |
| 71 CFLAGS="$CFLAGS -wd810" | |
| 72 # parameter was never referenced | |
| 73 CFLAGS="$CFLAGS -wd869" | |
| 681 | 74 # attribute "unused" is only allowed in a function definition, warning on pTHX_ |
| 75 CFLAGS="$CFLAGS -wd1301" | |
| 501 | 76 |
| 77 # STUB | |
| 78 # enumerated type mixed with another type | |
| 79 CFLAGS="$CFLAGS -wd188" | |
| 80 # controlling expression is constant | |
| 81 CFLAGS="$CFLAGS -wd279" | |
| 82 # operands are evaluated in unspecified order | |
| 83 CFLAGS="$CFLAGS -wd981" | |
| 84 # external definition with no prior declaration | |
| 85 CFLAGS="$CFLAGS -wd1418" | |
| 86 # external declaration in primary source file | |
| 87 CFLAGS="$CFLAGS -wd1419" | |
| 521 | 88 |
| 89 case "$NGX_ICC_VER" in | |
| 573 | 90 9.*) |
| 577 | 91 # "cc" clobber ignored, warnings for Liunx's htonl()/htons() |
| 521 | 92 CFLAGS="$CFLAGS -wd1469" |
| 563 | 93 # explicit conversion of a 64-bit integral type to a smaller |
| 94 # integral type | |
| 95 CFLAGS="$CFLAGS -wd1683" | |
| 96 # conversion from pointer to same-sized integral type, | |
| 97 # warning on offsetof() | |
| 98 CFLAGS="$CFLAGS -wd1684" | |
| 595 | 99 # floating-point equality and inequality comparisons are unreliable, |
| 100 # warning on SvTRUE() | |
| 101 CFLAGS="$CFLAGS -wd1572" | |
| 521 | 102 ;; |
| 103 | |
| 573 | 104 8.*) |
| 577 | 105 # "cc" clobber ignored, warnings for Liunx's htonl()/htons() |
| 573 | 106 CFLAGS="$CFLAGS -wd1469" |
| 595 | 107 # floating-point equality and inequality comparisons are unreliable, |
| 108 # warning on SvTRUE() | |
| 109 CFLAGS="$CFLAGS -wd1572" | |
| 573 | 110 ;; |
| 111 | |
| 521 | 112 *) |
| 113 ;; | |
| 114 esac | |
| 479 | 115 |
| 455 | 116 # stop on warning |
| 117 CFLAGS="$CFLAGS -Werror" | |
| 118 | |
| 119 # debug | |
| 120 CFLAGS="$CFLAGS -g" |