summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-07-02 17:08:26 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-07-02 17:08:26 +0000
commita6633971fbedea1e0ae1df2dfbaa7bbce7d500da (patch)
treed3a405ac90dc29b9dc22240726d06a5122d583d6
parent63c3d481684fed4d9589d4566d3631e21458d215 (diff)
downloadnginx-a6633971fbedea1e0ae1df2dfbaa7bbce7d500da.tar.gz
nginx-a6633971fbedea1e0ae1df2dfbaa7bbce7d500da.tar.bz2
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
Diffstat (limited to '')
-rw-r--r--auto/os/conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/auto/os/conf b/auto/os/conf
index 8c18a63fc..5e658b5f3 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -93,6 +93,7 @@ case "$NGX_MACHINE" in
;;
*)
+ have=NGX_ALIGNMENT value=16 . auto/define
NGX_MACH_CACHE_LINE=32
;;