merge 294825: Detect if we can rely on compiler-specific alignment features else

use custom workarounds. Fixes #50753 (johannes)

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 75f0c91f99edfafd85e6848c15476bee7e569742..0580d02f5195591db42ac206ee3898efdcfc1fef 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -235,6 +235,41 @@ dnl
 dnl If one of them is missing, use our own implementation, portable code is then possible
 dnl
 if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
+
+  dnl
+  dnl Check for __alignof__ support in the compiler
+  dnl
+  AC_CACHE_CHECK(whether the compiler supports __alignof__,ac_cv_alignof_exists,[
+  AC_TRY_COMPILE([
+int main() {
+       int align = __alignof__(int);
+       return 0;
+}
+  ],[
+    ac_cv_alignof_exists=yes
+  ],[
+    ac_cv_alignof_exists=no
+  ])])
+  if test "$ac_cv_alignof_exists" = "yes"; then
+    AC_DEFINE([HAVE_ALIGNOF], 1, [whether the compiler supports __alignof__])
+  fi
+
+  dnl 
+  dnl Check for __attribute__ ((__aligned__)) support in the compiler
+  dnl
+  AC_CACHE_CHECK(whether the compiler supports aligned attribute,ac_cv_attribute_aligned,[
+  AC_TRY_COMPILE([
+    unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
+  ],[
+    ac_cv_attribute_aligned=yes
+  ],[
+    ac_cv_attribute_aligned=no
+  ])])
+  if test "$ac_cv_attribute_aligned" = "yes"; then
+    AC_DEFINE([HAVE_ATTRIBUTE_ALIGNED], 1, [wheter the compiler supports __attribute__ ((__aligned__))])
+  fi
+    
+
   AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
   AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt])
   AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt])

diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c
index eb839ef0e6559435bd7e046b82ced98e92561cfe..b2f64f273792b430a77fc10ff06195db7c7c60b2 100644 (file)
--- a/ext/standard/crypt_sha256.c
+++ b/ext/standard/crypt_sha256.c
@@ -19,7 +19,15 @@
 # elif HAVE_STDINT_H
 #  include <stdint.h>
 # endif
-# include <stdbool.h>
+# ifndef HAVE_ALIGNOF
+#  include <stddef.h>
+#  define __alignof__(type) offsetof (struct { char c; type member;}, member)
+# endif
+# if HAVE_ATTRIBUTE_ALIGNED
+#  define ALIGNED(size) __attribute__ ((__aligned__ (size)))
+# else
+#  define ALIGNED(size)
+# endif
 #endif
 
 #include <stdio.h>
@@ -344,10 +352,8 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b
        __declspec(align(32)) unsigned char temp_result[32];
 # endif
 #else
-       unsigned char alt_result[32]
-       __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
-       unsigned char temp_result[32]
-       __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
+       unsigned char alt_result[32] ALIGNED(__alignof__ (uint32_t));
+       unsigned char temp_result[32] ALIGNED(__alignof__ (uint32_t));
 #endif
 
        struct sha256_ctx ctx;

diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c
index c5ca6461ff2068f58accf4dac18547bb2336ac6d..267cd6e59495a7011e1242e5aa790b96aed76582 100644 (file)
--- a/ext/standard/crypt_sha512.c
+++ b/ext/standard/crypt_sha512.c
@@ -18,7 +18,15 @@
 # elif HAVE_STDINT_H
 #  include <stdint.h>
 # endif
-# include <stdbool.h>
+# ifndef HAVE_ALIGNOF
+#  include <stddef.h>
+#  define __alignof__(type) offsetof (struct { char c; type member;}, member)
+# endif
+# if HAVE_ATTRIBUTE_ALIGNED
+#  define ALIGNED(size) __attribute__ ((__aligned__ (size)))
+# else
+#  define ALIGNED(size)
+# endif
 #endif
 
 #include <stdio.h>
@@ -372,10 +380,8 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
        __declspec(align(64)) unsigned char temp_result[64];
 # endif
 #else
-       unsigned char alt_result[64]
-               __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
-       unsigned char temp_result[64]
-               __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
+       unsigned char alt_result[64] ALIGNED(__alignof__ (uint64_t));
+       unsigned char temp_result[64] ALIGNED(__alignof__ (uint64_t));
 #endif
        struct sha512_ctx ctx;
        struct sha512_ctx alt_ctx;