mirror of
https://github.com/nginx/nginx.git
synced 2024-12-12 18:29:00 +08:00
2402502c2f
*) Feature: the ngx_http_map_module.
*) Feature: the "types_hash_max_size" and "types_hash_bucket_size"
directives.
*) Feature: the "ssi_value_length" directive.
*) Feature: the "worker_rlimit_core" directive.
*) Workaround: the connection number in logs was always 1 if nginx was
built by the icc 8.1 or 9.0 compilers with optimization for
Pentium 4.
*) Bugfix: the "config timefmt" SSI command set incorrect time format.
*) Bugfix: nginx did not close connection to IMAP/POP3 backend for the
SSL connections; the bug had appeared in 0.3.13.
Thanks to Rob Mueller.
*) Bugfix: segmentation fault may occurred in at SSL shutdown; the bug
had appeared in 0.3.13.
175 lines
3.3 KiB
Plaintext
175 lines
3.3 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
# gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2
|
|
# 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4.0, 3.4.2
|
|
# 4.0.0, 4.0.1, 4.1.0
|
|
|
|
|
|
NGX_GCC_VER=`$CC -v 2>&1 | grep 'gcc version' 2>&1 \
|
|
| sed -e 's/^.* version \(.*\)/\1/'`
|
|
|
|
echo " + gcc version: $NGX_GCC_VER"
|
|
|
|
have=NGX_COMPILER value="\"gcc $NGX_GCC_VER\"" . auto/define
|
|
|
|
|
|
# Solaris 7's /usr/ccs/bin/as does not support "-pipe"
|
|
|
|
CC_TEST_FLAGS="-pipe"
|
|
|
|
ngx_feature="gcc -pipe switch"
|
|
ngx_feature_name=
|
|
ngx_feature_run=no
|
|
ngx_feature_incs=
|
|
ngx_feature_libs=
|
|
ngx_feature_test=
|
|
. auto/feature
|
|
|
|
CC_TEST_FLAGS=
|
|
|
|
if [ $ngx_found = yes ]; then
|
|
PIPE="-pipe"
|
|
fi
|
|
|
|
|
|
case "$NGX_MACHINE" in
|
|
|
|
sun4u | sparc | sparc64 )
|
|
# "-mcpu=v9" enables the "casa" assembler instruction
|
|
CFLAGS="$CFLAGS -mcpu=v9"
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
# optimizations
|
|
|
|
#NGX_GCC_OPT="-O2"
|
|
#NGX_GCC_OPT="-Os"
|
|
NGX_GCC_OPT="-O"
|
|
|
|
CFLAGS="$CFLAGS $NGX_GCC_OPT"
|
|
|
|
#CFLAGS="$CFLAGS -fomit-frame-pointer"
|
|
|
|
case $CPU in
|
|
pentium)
|
|
# optimize for Pentium and Athlon
|
|
CPU_OPT="-march=pentium"
|
|
NGX_CPU_CACHE_LINE=32
|
|
;;
|
|
|
|
pentiumpro | pentium3)
|
|
# optimize for Pentium Pro, Pentium II and Pentium III
|
|
CPU_OPT="-march=pentiumpro"
|
|
NGX_CPU_CACHE_LINE=32
|
|
;;
|
|
|
|
pentium4)
|
|
# optimize for Pentium 4, gcc 3.x
|
|
CPU_OPT="-march=pentium4"
|
|
NGX_CPU_CACHE_LINE=128
|
|
;;
|
|
|
|
athlon)
|
|
# optimize for Athlon, gcc 3.x
|
|
CPU_OPT="-march=athlon"
|
|
NGX_CPU_CACHE_LINE=64
|
|
;;
|
|
|
|
opteron)
|
|
# optimize for Opteron, gcc 3.x
|
|
CPU_OPT="-march=opteron"
|
|
NGX_CPU_CACHE_LINE=64
|
|
;;
|
|
|
|
sparc32)
|
|
# build 32-bit UltraSparc binary
|
|
CPU_OPT="-m32"
|
|
CORE_LINK="$CORE_LINK -m32"
|
|
CC_AUX_FLAGS="$CC_AUX_FLAGS -m32"
|
|
NGX_CPU_CACHE_LINE=64
|
|
;;
|
|
|
|
sparc64)
|
|
# build 64-bit UltraSparc binary
|
|
CPU_OPT="-m64"
|
|
CORE_LINK="$CORE_LINK -m64"
|
|
CC_AUX_FLAGS="$CC_AUX_FLAGS -m64"
|
|
NGX_CPU_CACHE_LINE=64
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
case "$NGX_GCC_VER" in
|
|
2.7*)
|
|
# batch build
|
|
CPU_OPT=
|
|
;;
|
|
esac
|
|
|
|
|
|
CFLAGS="$CFLAGS $PIPE $CPU_OPT"
|
|
|
|
if [ ".$PCRE_OPT" = "." ]; then
|
|
PCRE_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT"
|
|
else
|
|
PCRE_OPT="$PCRE_OPT $PIPE"
|
|
fi
|
|
|
|
if [ ".$MD5_OPT" = "." ]; then
|
|
MD5_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT"
|
|
else
|
|
MD5_OPT="$MD5_OPT $PIPE"
|
|
fi
|
|
|
|
if [ ".$ZLIB_OPT" = "." ]; then
|
|
ZLIB_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT"
|
|
else
|
|
ZLIB_OPT="$ZLIB_OPT $PIPE"
|
|
fi
|
|
|
|
|
|
# warnings
|
|
|
|
# -W requires at least -O
|
|
CFLAGS="$CFLAGS ${NGX_GCC_OPT:-O} -W"
|
|
|
|
CFLAGS="$CFLAGS -Wall -Wpointer-arith"
|
|
#CFLAGS="$CFLAGS -Wconversion"
|
|
#CFLAGS="$CFLAGS -Winline"
|
|
|
|
|
|
case "$NGX_GCC_VER" in
|
|
3.* | 4.* )
|
|
# we have a lot of the unused function arguments
|
|
CFLAGS="$CFLAGS -Wno-unused-parameter"
|
|
CFLAGS="$CFLAGS -Wno-unused-function"
|
|
CFLAGS="$CFLAGS -Wunused-variable"
|
|
CFLAGS="$CFLAGS -Wunused-value"
|
|
#CFLAGS="$CFLAGS -Wunreachable-code"
|
|
;;
|
|
|
|
*)
|
|
# we have a lot of the unused function arguments
|
|
CFLAGS="$CFLAGS -Wno-unused"
|
|
;;
|
|
esac
|
|
|
|
|
|
# stop on warning
|
|
CFLAGS="$CFLAGS -Werror"
|
|
|
|
# debug
|
|
CFLAGS="$CFLAGS -g"
|
|
|
|
# DragonFly's gcc3 generates DWARF
|
|
#CFLAGS="$CFLAGS -g -gstabs"
|
|
|
|
if [ ".$CPP" = "." ]; then
|
|
CPP="$CC -E"
|
|
fi
|