diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-10 20:56:39 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-10 20:56:39 +0000 |
| commit | 7b90834fbab2f2d5979a2787674bb246139405d9 (patch) | |
| tree | 6a2234fff3dfa74b1afa76e31ccd427c5d3bace3 /auto/cc | |
| parent | 24b56c92bb344a5377f02eda85c639f86a8592ff (diff) | |
| download | nginx-7b90834fbab2f2d5979a2787674bb246139405d9.tar.gz nginx-7b90834fbab2f2d5979a2787674bb246139405d9.tar.bz2 | |
nginx-0.0.2-2004-03-10-23:56:39 import
Diffstat (limited to 'auto/cc')
| -rw-r--r-- | auto/cc | 61 |
1 files changed, 44 insertions, 17 deletions
@@ -7,19 +7,30 @@ case $CC in # optimization #CFLAGS="$CFLAGS -O2 -fomit-frame-pointer" - case $CPU_OPT in + case $CPU in pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III - LIB_OPT="-march=pentiumpro" + CPU_OPT="-march=pentiumpro" ;; pentium4) # optimize for Pentium 4, gcc 3.x - LIB_OPT="-march=pentium4" + CPU_OPT="-march=pentium4" ;; esac - CFLAGS="$CFLAGS $LIB_OPT" - ZLIB_OPT="-O2 -fomit-frame-pointer $LIB_OPT" + CFLAGS="$CFLAGS $CPU_OPT" + + if [ $PCRE_OPT = NO ]; then + PCRE_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $CPU_OPT\"" + fi + + if [ $MD5_OPT = NO ]; then + MD5_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $CPU_OPT\"" + fi + + if [ $ZLIB_OPT = NO ]; then + ZLIB_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $CPU_OPT $ZLIB_ASMV\"" + fi # warnings CFLAGS="$CFLAGS -O -W" @@ -57,19 +68,35 @@ case $CC in # optimization CFLAGS="$CFLAGS -O" + # inline functions declared with __inline + CFLAGS="$CFLAGS -Ob1" + # inline any function, at the compiler's discretion + #CFLAGS="$CFLAGS -Ob2" - case $CPU_OPT in + case $CPU in pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III - LIB_OUT="-mcpu=pentiumpro -march=pentiumpro" + CPU_OPT="-mcpu=pentiumpro -march=pentiumpro" ;; pentium4) # optimize for Pentium 4, default - LIB_OPT="-march=pentium4" + CPU_OPT="-march=pentium4" ;; esac - CFLAGS="$CFLAGS $LIB_OUT" + CFLAGS="$CFLAGS $CPU_OPT" + + if [ $PCRE_OPT = NO ]; then + PCRE_OPT="CFLAGS=\"-O $CPU_OPT\"" + fi + + if [ $MD5_OPT = NO ]; then + MD5_OPT="CFLAGS=\"-O $CPU_OPT\"" + fi + + if [ $ZLIB_OPT = NO ]; then + ZLIB_OPT="CFLAGS=\"-O $CPU_OPT $ZLIB_ASMV\"" + fi # warnings CFLAGS="$CFLAGS -w1" @@ -108,18 +135,18 @@ case $CC in # disable stack checking calls CFLAGS="$CFLAGS -Gs" - case $CPU_OPT in + case $CPU in pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III - LIB_OUT="-G6" + CPU_OPT="-G6" ;; pentium4) # optimize for Pentium 4 - #LIB_OUT="-G7" + #CPU_OPT="-G7" ;; esac - CFLAGS="$CFLAGS $LIB_OUT" + CFLAGS="$CFLAGS $CPU_OPT" # warnings CFLAGS="$CFLAGS -W3" @@ -184,17 +211,17 @@ case $CC in # disable stack checking calls CFLAGS="$CFLAGS -s" - case $CPU_OPT in + case $CPU in pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III # register-based arguments passing conventions - LIB_OUT="-6r" + CPU_OPT="-6r" # stack-based arguments passing conventions - #LIB_OUT="-6s" + #CPU_OPT="-6s" ;; esac - CFLAGS="$CFLAGS $LIB_OUT" + CFLAGS="$CFLAGS $CPU_OPT" # warnings #CFLAGS="$CFLAGS -w3" |