# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1341248906 0
# Node ID 4ff2131dbce5b3604fb141cda2fe9e95d483a38e
# Parent  fc62b72f759741789a75ebbc2fb319c7331e023e
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

diff --git a/auto/os/conf b/auto/os/conf
--- 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
     ;;