diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-14 09:39:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-14 09:39:03 +0200 |
| commit | ae5ca5459f9b724495c967eaa72b414c4ccb8c8b (patch) | |
| tree | 55d154c404ae7794d25e5c240bc3c1b3ce863bae /ext/standard/crc32.c | |
| parent | a4cc9d83a130cd99c5074ce3a38e519757c15384 (diff) | |
| parent | ae1d4a820a5c95acbffba903cf1e61261308078e (diff) | |
| download | php-git-ae5ca5459f9b724495c967eaa72b414c4ccb8c8b.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix lcov genhtml: ERROR: cannot read [file]
Properly detect CRC32 APIs on aarch64 from configure
Diffstat (limited to 'ext/standard/crc32.c')
| -rw-r--r-- | ext/standard/crc32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c index ee8ef685d6..43f2ff74d0 100644 --- a/ext/standard/crc32.c +++ b/ext/standard/crc32.c @@ -18,7 +18,7 @@ #include "basic_functions.h" #include "crc32.h" -#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) +#if HAVE_AARCH64_CRC32 # include <arm_acle.h> # if defined(__linux__) # include <sys/auxv.h> @@ -83,7 +83,7 @@ PHP_FUNCTION(crc32) crc = crcinit^0xFFFFFFFF; -#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) +#if HAVE_AARCH64_CRC32 if (has_crc32_insn()) { crc = crc32_aarch64(crc, p, nr); RETURN_LONG(crc^0xFFFFFFFF); |