com php-src: Move HAVE_ATTRIBUTE_ALIGNED check outside crypt block: ext/standard/config.m4

From: Date: Fri, 25 Mar 2016 19:50:52 +0000
Subject: com php-src: Move HAVE_ATTRIBUTE_ALIGNED check outside crypt block: ext/standard/config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91483@lists.php.net to get a copy of this message
Commit: be7a50b9ab4f17b224f82e32dddd249b17f6ba36 Author: Nikita Popov <nikic@php.net> Fri, 25 Mar 2016 20:50:52 +0100 Parents: 786effaff63aff747c2e33fa5fd3e2cc5560cc9a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be7a50b9ab4f17b224f82e32dddd249b17f6ba36 Log: Move HAVE_ATTRIBUTE_ALIGNED check outside crypt block This is checked outside the crypt() implementation as well.. Changed paths: M ext/standard/config.m4 Diff: diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index c41593c..26eb056 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -260,23 +260,6 @@ if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test 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, [whether 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]) PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c) @@ -284,6 +267,22 @@ else AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des]) 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, [whether the compiler supports __attribute__ ((__aligned__))]) +fi + dnl dnl Check for available functions dnl

« previous php.cvs (#91483) next »