Mercurial > hg > nginx
annotate auto/os/conf @ 4729:4ff2131dbce5 stable-1.2
Merge of r4691: changed default alignment to 16.
This fixes alignment problems observerd on ARMs, and likely also needed
for MIPSes. Unless we know alignment is not required just assume we
need 16, which appears to be safe default for all architectures.
See here for details:
http://mailman.nginx.org/pipermail/nginx/2012-June/034139.html
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 02 Jul 2012 17:08:26 +0000 |
| parents | d620f497c50f |
| children | 489839d07b38 |
| rev | line source |
|---|---|
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
355
diff
changeset
|
1 |
|
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
355
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
355
diff
changeset
|
4 |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
| 563 | 6 echo "checking for $NGX_SYSTEM specific features" |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
| 493 | 8 case "$NGX_PLATFORM" in |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 |
|
688
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
10 FreeBSD:*) |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 . auto/os/freebsd |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
12 ;; |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
13 |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
195
diff
changeset
|
14 Linux:*) |
|
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
195
diff
changeset
|
15 . auto/os/linux |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
16 ;; |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
17 |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
195
diff
changeset
|
18 SunOS:*) |
|
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
195
diff
changeset
|
19 . auto/os/solaris |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
20 ;; |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
21 |
|
2128
345a014436d4
*) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
940
diff
changeset
|
22 Darwin:*) |
|
345a014436d4
*) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
940
diff
changeset
|
23 . auto/os/darwin |
|
345a014436d4
*) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
940
diff
changeset
|
24 ;; |
|
345a014436d4
*) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
940
diff
changeset
|
25 |
|
2828
f5c80c69a72e
backout -r2827 and add correct fix
Igor Sysoev <igor@sysoev.ru>
parents:
2826
diff
changeset
|
26 win32) |
| 455 | 27 . auto/os/win32 |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
28 ;; |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
29 |
|
688
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
30 DragonFly:*) |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
31 have=NGX_FREEBSD . auto/have_headers |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
32 CORE_INCS="$UNIX_INCS" |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
33 CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS" |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
34 CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS" |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
35 |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
36 echo " + sendfile() found" |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
37 have=NGX_HAVE_SENDFILE . auto/have |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
38 CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS" |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
39 |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
40 ngx_spacer=' |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
41 ' |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
42 ;; |
|
03fa118203d6
separate DragonFlyBSD autoconfiguration from FreeBSD
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
43 |
| 515 | 44 HP-UX:*) |
| 45 # HP/UX | |
| 46 have=NGX_HPUX . auto/have_headers | |
| 47 CORE_INCS="$UNIX_INCS" | |
| 48 CORE_DEPS="$UNIX_DEPS $POSIX_DEPS" | |
| 49 CORE_SRCS="$UNIX_SRCS" | |
| 50 CC_AUX_FLAGS="$CC_AUX_FLAGS -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" | |
| 51 ;; | |
| 52 | |
| 53 OSF1:*) | |
| 517 | 54 # Tru64 UNIX |
| 515 | 55 have=NGX_TRU64 . auto/have_headers |
| 517 | 56 have=NGX_HAVE_STRERROR_R . auto/nohave |
| 515 | 57 CORE_INCS="$UNIX_INCS" |
| 58 CORE_DEPS="$UNIX_DEPS $POSIX_DEPS" | |
| 59 CORE_SRCS="$UNIX_SRCS" | |
| 60 ;; | |
| 61 | |
|
355
0fb6c53fb135
nginx-0.0.7-2004-06-15-21:47:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
62 *) |
|
0fb6c53fb135
nginx-0.0.7-2004-06-15-21:47:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
63 CORE_INCS="$UNIX_INCS" |
|
0fb6c53fb135
nginx-0.0.7-2004-06-15-21:47:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
64 CORE_DEPS="$UNIX_DEPS $POSIX_DEPS" |
|
0fb6c53fb135
nginx-0.0.7-2004-06-15-21:47:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
65 CORE_SRCS="$UNIX_SRCS" |
|
0fb6c53fb135
nginx-0.0.7-2004-06-15-21:47:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
66 ;; |
|
0fb6c53fb135
nginx-0.0.7-2004-06-15-21:47:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
320
diff
changeset
|
67 |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
68 esac |
| 455 | 69 |
| 70 | |
| 493 | 71 case "$NGX_MACHINE" in |
| 479 | 72 |
| 589 | 73 i386 | i686 | i86pc) |
| 509 | 74 have=NGX_HAVE_NONALIGNED . auto/have |
| 589 | 75 NGX_MACH_CACHE_LINE=32 |
| 76 ;; | |
| 77 | |
| 593 | 78 amd64 | x86_64) |
| 589 | 79 have=NGX_HAVE_NONALIGNED . auto/have |
| 80 NGX_MACH_CACHE_LINE=64 | |
| 509 | 81 ;; |
| 479 | 82 |
| 745 | 83 sun4u | sun4v | sparc | sparc64) |
| 581 | 84 have=NGX_ALIGNMENT value=16 . auto/define |
| 589 | 85 # TODO |
| 86 NGX_MACH_CACHE_LINE=64 | |
| 87 ;; | |
| 88 | |
| 89 ia64 ) | |
| 90 have=NGX_ALIGNMENT value=16 . auto/define | |
| 91 # TODO | |
| 92 NGX_MACH_CACHE_LINE=64 | |
| 93 ;; | |
| 94 | |
| 95 *) | |
|
4729
4ff2131dbce5
Merge of r4691: changed default alignment to 16.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
96 have=NGX_ALIGNMENT value=16 . auto/define |
| 589 | 97 NGX_MACH_CACHE_LINE=32 |
| 581 | 98 ;; |
| 99 | |
| 479 | 100 esac |
| 589 | 101 |
| 102 if test -z "$NGX_CPU_CACHE_LINE"; then | |
| 103 NGX_CPU_CACHE_LINE=$NGX_MACH_CACHE_LINE | |
| 104 fi | |
| 105 | |
| 106 have=NGX_CPU_CACHE_LINE value=$NGX_CPU_CACHE_LINE . auto/define |