61 lines
1.5 KiB
Diff
61 lines
1.5 KiB
Diff
|
From f150702d5ab72878d45b722b6d7d4194db92c44a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
||
|
|
Date: Mon, 9 Mar 2020 15:36:48 +0100
|
||
|
|
Subject: [PATCH] Check for sys/auxv.h before using it.
|
||
|
|
|
||
|
|
Fixes aarch64 compile wiht uclibc-ng (does not provide
|
||
|
|
sys/auxv.h header file).
|
||
|
|
|
||
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||
|
|
Upstream: https://github.com/php/php-src/commit/f73528f0e0d59ac744ccb4a94a3a9d7b9f0fba1b
|
||
|
|
---
|
||
|
|
configure.ac | 1 +
|
||
|
|
ext/standard/crc32.c | 9 +++++++--
|
||
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 5219a5f2..caf62302 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -440,6 +440,7 @@ resolv.h \
|
||
|
|
strings.h \
|
||
|
|
syslog.h \
|
||
|
|
sysexits.h \
|
||
|
|
+sys/auxv.h \
|
||
|
|
sys/ioctl.h \
|
||
|
|
sys/file.h \
|
||
|
|
sys/mman.h \
|
||
|
|
diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c
|
||
|
|
index c3ca5903..e59ab45f 100644
|
||
|
|
--- a/ext/standard/crc32.c
|
||
|
|
+++ b/ext/standard/crc32.c
|
||
|
|
@@ -17,10 +17,15 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
#include "php.h"
|
||
|
|
+#ifdef PHP_WIN32
|
||
|
|
+#include "config.w32.h"
|
||
|
|
+#else
|
||
|
|
+#include <php_config.h>
|
||
|
|
+#endif
|
||
|
|
#include "basic_functions.h"
|
||
|
|
#include "crc32.h"
|
||
|
|
|
||
|
|
-#if defined(__aarch64__)
|
||
|
|
+#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H)
|
||
|
|
# include <arm_acle.h>
|
||
|
|
# if defined(__linux__)
|
||
|
|
# include <sys/auxv.h>
|
||
|
|
@@ -85,7 +90,7 @@ PHP_NAMED_FUNCTION(php_if_crc32)
|
||
|
|
|
||
|
|
crc = crcinit^0xFFFFFFFF;
|
||
|
|
|
||
|
|
-#if defined(__aarch64__)
|
||
|
|
+#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H)
|
||
|
|
if (has_crc32_insn()) {
|
||
|
|
crc = crc32_aarch64(crc, p, nr);
|
||
|
|
RETURN_LONG(crc^0xFFFFFFFF);
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|