Patch i386-Zend_Zend_m4.patch for opcache Bug #65561

Patch version 2013-08-26 19:43 UTC

• 2013-08-26 19:43 UTC [diff to current]

Developer: craig.mohrman@oracle.com

# NOTE x86 ONLY:
# When php is compiled with Solaris Studio it chooses
#       LIBZEND_MM_ALIGN=8
#       LIBZEND_MM_ALIGN_LOG2=3
# which causes the Zend Opcache extension to fail horribly.
# Using gcc these get set to 4 and 2 respectively.
# And forcing these to 4 and 2 for Solaris Studio also allows
# Zend Opcache to function.  Don't know why.  Don't ask.
# No such issues on sparc.  Don't know why.  Don't ask.

--- php-5.3.27/Zend/Zend.m4_orig        2013-07-10 10:43:08.000000000 -0700
+++ php-5.3.27/Zend/Zend.m4     2013-08-19 15:11:17.267300088 -0700
@@ -293,8 +293,8 @@
   exit(0);
 }
 ], [
-  LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
-  LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
+  LIBZEND_MM_ALIGN=4
+  LIBZEND_MM_ALIGN_LOG2=2
   AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
   AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
 ], [], [