[nginx] svn commit: r4730 - in branches/stable-1.2: . auto/os

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-07-02 17:08:26 +0000 (Mon, 02 Jul 2012)
New Revision: 4730
URL: http://trac.nginx.org/nginx/changeset/4730/nginx

Log:
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


Modified:
   branches/stable-1.2/
   branches/stable-1.2/auto/os/conf

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-07-02 16:59:34 UTC (rev 4729)
+++ branches/stable-1.2	2012-07-02 17:08:26 UTC (rev 4730)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4690,4692,4694-4696,4699,4704-4706
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4692,4694-4696,4699,4704-4706
\ No newline at end of property
Modified: branches/stable-1.2/auto/os/conf
===================================================================
--- branches/stable-1.2/auto/os/conf	2012-07-02 16:59:34 UTC (rev 4729)
+++ branches/stable-1.2/auto/os/conf	2012-07-02 17:08:26 UTC (rev 4730)
@@ -93,6 +93,7 @@
     ;;
 
     *)
+        have=NGX_ALIGNMENT value=16 . auto/define
         NGX_MACH_CACHE_LINE=32
     ;;