diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-12 16:57:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-12 16:57:08 +0000 |
| commit | 67f88e9cc678d31b5995518922d3fcb63a129465 (patch) | |
| tree | 370c489b498feddaf17f12b125f6f75d69cdb9f2 /auto | |
| parent | a893eab667078a8ad9f473296663b36e6ade111a (diff) | |
| download | nginx-67f88e9cc678d31b5995518922d3fcb63a129465.tar.gz nginx-67f88e9cc678d31b5995518922d3fcb63a129465.tar.bz2 | |
nginx-0.0.2-2004-03-12-19:57:08 import
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc | 26 | ||||
| -rw-r--r-- | auto/lib/md5/make | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 32 | ||||
| -rw-r--r-- | auto/sources | 18 |
4 files changed, 62 insertions, 16 deletions
@@ -8,10 +8,16 @@ case $CC in #CFLAGS="$CFLAGS -O2 -fomit-frame-pointer" case $CPU in + pentium) + # optimize for Pentium and Athlon + CPU_OPT="-march=pentium" + ;; + pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III CPU_OPT="-march=pentiumpro" ;; + pentium4) # optimize for Pentium 4, gcc 3.x CPU_OPT="-march=pentium4" @@ -85,10 +91,16 @@ case $CC in #CFLAGS="$CFLAGS -Ob2" case $CPU in + pentium) + # optimize for Pentium and Athlon + CPU_OPT="-march=pentium" + ;; + pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III CPU_OPT="-mcpu=pentiumpro -march=pentiumpro" ;; + pentium4) # optimize for Pentium 4, default CPU_OPT="-march=pentium4" @@ -148,9 +160,15 @@ case $CC in case $CPU in pentiumpro) + # optimize for Pentium and Athlon + CPU_OPT="-G5" + ;; + + pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III CPU_OPT="-G6" ;; + pentium4) # optimize for Pentium 4 #CPU_OPT="-G7" @@ -218,6 +236,14 @@ case $CC in CFLAGS="$CFLAGS -s" case $CPU in + pentium) + # optimize for Pentium and Athlon + # register-based arguments passing conventions + CPU_OPT="-5r" + # stack-based arguments passing conventions + #CPU_OPT="-5s" + ;; + pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III # register-based arguments passing conventions diff --git a/auto/lib/md5/make b/auto/lib/md5/make index 0f2bb3ca1..26c2f4858 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -48,7 +48,7 @@ case $PLATFORM in echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE - echo " MD5_ASM_OBJ=asm/mx86-elf.o \\" >> $MAKEFILE + echo " MD5_ASM_OBJ=asm/mx86-sol.o \\" >> $MAKEFILE echo " CC=$CC CPP=\"$CPP\" libmd5.a" >> $MAKEFILE done=YES diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 2c02ca717..46cd653d9 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -40,17 +40,31 @@ case $PLATFORM in done=YES ;; + # FreeBSD: i386 + # Linux: i686 *:i386 | *:i686) - if [ $ZLIB_ASM = pentiumpro ]; then - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE - echo " && CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE - - done=YES - fi + case $ZLIB_ASM in + pentium) + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && cp contrib/asm586/match.S . \\" >> $MAKEFILE + echo " && CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE + echo " ./configure \\" >> $MAKEFILE + echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + done=YES + ;; + + pentiumpro) + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE + echo " && CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE + echo " ./configure \\" >> $MAKEFILE + echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + done=YES + ;; + esac ;; esac diff --git a/auto/sources b/auto/sources index f744ac537..05f19a6c6 100644 --- a/auto/sources +++ b/auto/sources @@ -166,8 +166,9 @@ WIN32_SRCS="$CORE_SRCS $EVENT_SRCS \ HTTP_MODULES="ngx_http_module \ ngx_http_core_module \ - ngx_http_log_module \ - ngx_http_cache_module" + ngx_http_log_module" + +HTTP_FILE_CACHE_MODULE=ngx_http_cache_module HTTP_FILTER_MODULES="ngx_http_write_filter_module \ ngx_http_output_filter_module \ @@ -196,9 +197,6 @@ HTTP_SRCS="src/http/ngx_http.c \ src/http/ngx_http_core_module.c \ src/http/ngx_http_special_response.c \ src/http/ngx_http_request.c \ - src/http/ngx_http_cache.c \ - src/http/ngx_http_file_cache.c \ - src/http/ngx_http_busy_lock.c \ src/http/ngx_http_parse.c \ src/http/ngx_http_headers.c \ src/http/ngx_http_header_filter.c \ @@ -214,6 +212,12 @@ HTTP_SRCS="src/http/ngx_http.c \ src/http/modules/ngx_http_charset_filter.c \ src/http/modules/ngx_http_not_modified_filter.c" +# STUB +HTTP_SRCS="$HTTP_SRCS src/http/ngx_http_busy_lock.c" + +HTPP_CACHE_SRCS=src/http/ngx_http_cache.c +HTPP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c + HTTP_REWRITE_MODULE=ngx_http_rewrite_module HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_handler.c @@ -234,6 +238,8 @@ HTTP_PROXY_INCS="-I src/http/modules/proxy" HTTP_PROXY_DEPS=src/http/modules/proxy/ngx_http_proxy_handler.h HTTP_PROXY_SRCS="src/http/modules/proxy/ngx_http_proxy_handler.c \ src/http/modules/proxy/ngx_http_proxy_upstream.c \ - src/http/modules/proxy/ngx_http_proxy_cache.c \ src/http/modules/proxy/ngx_http_proxy_parse.c \ src/http/modules/proxy/ngx_http_proxy_header.c" + +# STUB +# src/http/modules/proxy/ngx_http_proxy_cache.c \ |