diff options
Diffstat (limited to 'auto/os')
| -rw-r--r-- | auto/os/conf | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/auto/os/conf b/auto/os/conf index f4ba388e1..0ddbacbee 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -59,12 +59,36 @@ esac case "$NGX_MACHINE" in - i386 | i686 | i86pc | amd64) + i386 | i686 | i86pc) have=NGX_HAVE_NONALIGNED . auto/have + NGX_MACH_CACHE_LINE=32 ;; - sun4u | sparc | sparc64 | ia64 ) + amd64) + have=NGX_HAVE_NONALIGNED . auto/have + NGX_MACH_CACHE_LINE=64 + ;; + + sun4u | sparc | sparc64) + have=NGX_ALIGNMENT value=16 . auto/define + # TODO + NGX_MACH_CACHE_LINE=64 + ;; + + ia64 ) have=NGX_ALIGNMENT value=16 . auto/define + # TODO + NGX_MACH_CACHE_LINE=64 + ;; + + *) + NGX_MACH_CACHE_LINE=32 ;; esac + +if test -z "$NGX_CPU_CACHE_LINE"; then + NGX_CPU_CACHE_LINE=$NGX_MACH_CACHE_LINE +fi + +have=NGX_CPU_CACHE_LINE value=$NGX_CPU_CACHE_LINE . auto/define |