summaryrefslogtreecommitdiff
path: root/ext/hash
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2019-03-02 21:25:35 +0100
committerAnatol Belski <ab@php.net>2019-03-02 21:25:35 +0100
commit8cd345acb1064ffe695e69217333ed2b83de45c3 (patch)
tree374e7a4a709a1ee8c21d93a890b49e67ef9d027d /ext/hash
parent6a54282728c66d20be4f359d7546243a8ca400bd (diff)
downloadphp-git-8cd345acb1064ffe695e69217333ed2b83de45c3.tar.gz
Heedlessly enable thread LS cache for ext/hash.
It's always static now and as such always has access to the cached TLS pointer.
Diffstat (limited to 'ext/hash')
-rw-r--r--ext/hash/config.m42
-rw-r--r--ext/hash/config.w322
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index dcf5e017e4..21f419ed71 100644
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -33,7 +33,7 @@ else
SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
])
EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
- PHP_HASH_CFLAGS="-I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded"
+ PHP_HASH_CFLAGS="-I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
fi
diff --git a/ext/hash/config.w32 b/ext/hash/config.w32
index 4a81060385..bb3b339952 100644
--- a/ext/hash/config.w32
+++ b/ext/hash/config.w32
@@ -28,7 +28,7 @@ if (!CHECK_HEADER_ADD_INCLUDE('KeccakHash.h', 'CFLAGS_HASH', hash_sha3_dir)) {
ERROR('Unable to locate SHA3 headers');
}
-ADD_FLAG('CFLAGS_HASH', '/DKeccakP200_excluded /DKeccakP400_excluded /DKeccakP800_excluded');
+ADD_FLAG('CFLAGS_HASH', '/DKeccakP200_excluded /DKeccakP400_excluded /DKeccakP800_excluded /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
PHP_INSTALL_HEADERS('ext/hash/', 'php_hash.h php_hash_md.h php_hash_sha.h ' +
'php_hash_ripemd.h php_hash_haval.h php_hash_tiger.h ' +