mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 09:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

hash: Consistently check for PHP_HASH_INTRIN_SHA_* to guard compilation of SHA256_Transform_shani (#15404)

Browse Source 
This fixes the build for amd64 platforms that do not have
`HAVE_FUNC_ATTRIBUTE_TARGET`, specifically Alpine/Musl as of now.

Closes GH-15384.
Related to GH-15312.
This commit is contained in:
Tim Düsterhus 2024-08-14 15:18:07 +02:00 committed by GitHub
parent 74bf894950
commit a2a3c5ba8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -11,6 +11,9 @@ PHP NEWS
As such, passing invalid types to exit/die may now result in a TypeError
being thrown. (Girgias)
- Hash:
. Fix GH-15384 (Build fails on Alpine / Musl for amd64). (timwolla)
- Standard:
. php_uname() now throws ValueErrors on invalid inputs. (Girgias)

2
ext/hash/hash_sha_ni.c
View File

@ -27,7 +27,7 @@
#include "php_hash.h"
#include "php_hash_sha.h"
#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IMMINTRIN_H)
#if defined(PHP_HASH_INTRIN_SHA_NATIVE) || defined(PHP_HASH_INTRIN_SHA_RESOLVER)
# include <immintrin.h>

2
ext/hash/php_hash_sha.h
View File

@ -62,7 +62,9 @@ void SHA256_Transform_sse2(uint32_t state[PHP_STATIC_RESTRICT 8], const uint8_t
# elif defined(HAVE_FUNC_ATTRIBUTE_TARGET)
# define PHP_HASH_INTRIN_SHA_RESOLVER 1
# endif
#endif
#if defined(PHP_HASH_INTRIN_SHA_NATIVE) || defined(PHP_HASH_INTRIN_SHA_RESOLVER)
void SHA256_Transform_shani(uint32_t state[PHP_STATIC_RESTRICT 8], const uint8_t block[PHP_STATIC_RESTRICT 64]);
#endif