summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--auto/cc21
-rw-r--r--auto/lib/md5/conf11
-rw-r--r--auto/lib/pcre/conf19
-rw-r--r--auto/lib/pcre/make7
-rw-r--r--auto/lib/pcre/makefile.msvc9
-rw-r--r--auto/lib/pcre/makefile.owc10
-rw-r--r--auto/lib/zlib/conf15
-rw-r--r--auto/sources2
8 files changed, 76 insertions, 18 deletions
diff --git a/auto/cc b/auto/cc
index 90af1c444..4e89d9dba 100644
--- a/auto/cc
+++ b/auto/cc
@@ -86,9 +86,17 @@ case $CC in
# optimization
CFLAGS="$CFLAGS -O"
# inline functions declared with __inline
- CFLAGS="$CFLAGS -Ob1"
+ #CFLAGS="$CFLAGS -Ob1"
# inline any function, at the compiler's discretion
- #CFLAGS="$CFLAGS -Ob2"
+ CFLAGS="$CFLAGS -Ob2"
+
+ # single-file IP optimizations
+ #IPO="-ip"
+ # multi-file IP optimizations
+ IPO="-ipo -ipo_obj"
+ CFLAGS="$CFLAGS $IPO"
+ CORE_LINK="$CORE_LINK $IPO"
+ CORE_LINK="$CORE_LINK -opt_report_file=$OBJS/opt_report_file"
case $CPU in
pentium)
@@ -110,15 +118,15 @@ case $CC in
CFLAGS="$CFLAGS $CPU_OPT"
if [ ".$PCRE_OPT" = "." ]; then
- PCRE_OPT="-O $CPU_OPT"
+ PCRE_OPT="-O $IPO $CPU_OPT"
fi
if [ ".$MD5_OPT" = "." ]; then
- MD5_OPT="-O $CPU_OPT"
+ MD5_OPT="-O $IPO $CPU_OPT"
fi
if [ ".$ZLIB_OPT" = "." ]; then
- ZLIB_OPT="-O $CPU_OPT"
+ ZLIB_OPT="-O $IPO $CPU_OPT"
fi
# warnings
@@ -127,6 +135,9 @@ case $CC in
# stop on warning
CFLAGS="$CFLAGS -Werror"
+ # debug
+ CFLAGS="$CFLAGS -g"
+
have=HAVE_C99_VARIADIC_MACROS . auto/have
LINK="\$(CC)"
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index 3c7878382..57662f702 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -25,6 +25,17 @@ if [ $MD5 != NONE ]; then
CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
;;
+ *icc)
+ LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
+
+ # to allow -ipo optimization we link with the *.o but not library
+ CORE_LIBS="$CORE_LIBS $MD5/md5_dgst.o"
+
+ if [ $MD5_ASM = YES ]; then
+ CORE_LIBS="$CORE_LIBS $MD5/asm/mx86-elf.o"
+ fi
+ ;;
+
*)
LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 17df99f19..fe8213000 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -9,7 +9,8 @@ if [ $PCRE != NONE ]; then
cl)
have=HAVE_PCRE . auto/have
have=PCRE_STATIC . auto/have
- CORE_DEPS="$CORE_DEPS $PCRE/pcre.lib"
+ CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+ LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
CORE_LIBS="$CORE_LIBS pcre.lib"
CORE_LINK="$CORE_LINK -libpath:$PCRE"
;;
@@ -17,10 +18,24 @@ if [ $PCRE != NONE ]; then
wcl386)
have=HAVE_PCRE . auto/have
have=PCRE_STATIC . auto/have
- CORE_DEPS="$CORE_DEPS $PCRE/pcre.lib"
+ CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+ LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
;;
+ *icc)
+ have=HAVE_PCRE . auto/have
+ CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+
+ LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
+
+ # to allow -ipo optimization we link with the *.o but not library
+ CORE_LIBS="$CORE_LIBS $PCRE/maketables.o"
+ CORE_LIBS="$CORE_LIBS $PCRE/get.o"
+ CORE_LIBS="$CORE_LIBS $PCRE/study.o"
+ CORE_LIBS="$CORE_LIBS $PCRE/pcre.o"
+ ;;
+
*)
have=HAVE_PCRE . auto/have
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index cfb4da778..a4f140224 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -19,7 +19,12 @@ case $PLATFORM in
cp auto/lib/pcre/patch.config.in $PCRE
cp auto/lib/pcre/$makefile $PCRE
- echo "$PCRE/pcre.lib:" >> $MAKEFILE
+ echo "$PCRE/pcre.h:" >> $MAKEFILE
+ echo " cd $PCRE" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile pcre.h" >> $MAKEFILE
+ echo " cd ..\\..\\.." >> $MAKEFILE
+ echo >> $MAKEFILE
+ echo "$PCRE/pcre.lib: $PCRE/pcre.h" >> $MAKEFILE
echo " cd $PCRE" >> $MAKEFILE
echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 55a9a94e3..31921240c 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -3,10 +3,7 @@ CFLAGS = -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
-pcre.lib:
- patch -o pcre.h pcre.in patch.pcre.in
- patch -o config.h config.in patch.config.in
-
+pcre.lib: pcre.h
cl -Fedftables dftables.c
dftables > chartables.c
@@ -16,3 +13,7 @@ pcre.lib:
link -lib -out:pcre.lib -verbose:lib \
maketables.obj get.obj study.obj pcre.obj
+
+pcre.h:
+ patch -o pcre.h pcre.in patch.pcre.in
+ patch -o config.h config.in patch.config.in
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index 07ef5ac5c..41194f55f 100644
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -3,12 +3,14 @@ CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
-pcre.lib:
- patch -o pcre.h pcre.in patch.pcre.in
- patch -o config.h config.in patch.config.in
-
+pcre.lib: pcre.h
wcl386 -zq -bt=nt -l=nt -fe=dftables dftables.c
dftables > chartables.c
wcl386 $(CFLAGS) $(PCREFLAGS) maketables.c get.c study.c pcre.c
wlib -n pcre.lib maketables.obj get.obj study.obj pcre.obj
+
+
+pcre.h:
+ patch -o pcre.h pcre.in patch.pcre.in
+ patch -o config.h config.in patch.config.in
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf
index a779b21b6..754231221 100644
--- a/auto/lib/zlib/conf
+++ b/auto/lib/zlib/conf
@@ -15,6 +15,21 @@ if [ $ZLIB != NONE ]; then
CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
;;
+ *icc)
+ LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
+
+ # to allow -ipo optimization we link with the *.o but not library
+ CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o"
+ CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o"
+ CORE_LIBS="$CORE_LIBS $ZLIB/deflate.o"
+ CORE_LIBS="$CORE_LIBS $ZLIB/trees.o"
+ CORE_LIBS="$CORE_LIBS $ZLIB/zutil.o"
+
+ if [ $ZLIB_ASM != NO ]; then
+ CORE_LIBS="$CORE_LIBS $ZLIB/match.o"
+ fi
+ ;;
+
*)
LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
CORE_LIBS="$CORE_LIBS -L $ZLIB -lz"
diff --git a/auto/sources b/auto/sources
index 05f19a6c6..f8e43700d 100644
--- a/auto/sources
+++ b/auto/sources
@@ -225,8 +225,6 @@ HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_handler.c
HTTP_GZIP_FILTER_MODULE=ngx_http_gzip_filter_module
HTTP_GZIP_SRCS=src/http/modules/ngx_http_gzip_filter.c
-HTTP_GZIP_UNIX_LIBS=-lz
-HTTP_GZIP_WIN_LIBS=zlib.lib
HTTP_SSI_FILTER_MODULE=ngx_http_ssi_filter_module
generated by cgit (git 2.34.1) at 2026-01-03 09:44:42 +0000