summaryrefslogtreecommitdiffhomepage
path: root/auto/cc
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--auto/cc/gcc7
-rw-r--r--auto/cc/icc2
2 files changed, 8 insertions, 1 deletions
diff --git a/auto/cc/gcc b/auto/cc/gcc
index 9e0e52d9e..5c5f61cd8 100644
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -58,26 +58,31 @@ 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)
@@ -85,6 +90,7 @@ case $CPU in
CPU_OPT="-m32"
CORE_LINK="$CORE_LINK -m32"
CC_AUX_FLAGS="$CC_AUX_FLAGS -m32"
+ NGX_CPU_CACHE_LINE=64
;;
sparc64)
@@ -92,6 +98,7 @@ case $CPU in
CPU_OPT="-m64"
CORE_LINK="$CORE_LINK -m64"
CC_AUX_FLAGS="$CC_AUX_FLAGS -m64"
+ NGX_CPU_CACHE_LINE=64
;;
esac
diff --git a/auto/cc/icc b/auto/cc/icc
index 16cb2bb42..1a4111b93 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -2,7 +2,7 @@
# Copyright (C) Igor Sysoev
-# Intel C++ compiler 7.1, 8.0, 8.1
+# Intel C++ compiler 7.1, 8.0, 8.1, 9.0
NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
| sed -e 's/^.* Version \(.*\) Build.*$/\1/'`