From 67352cb2c01706b75d9a6f2793a2022f4751e355 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 28 Jun 2018 15:26:45 +0200 Subject: [PATCH] Fix bug #76392 On systems without glibc, such as Alpine with Musl libc, the function attributes are not supported. GCC 6 doesn't properly omit some systems. This is already fixed in GCC 7 but for systems with GCC 6 and ones without glibc, this additional check fixes this bug. --- NEWS | 4 ++++ configure.ac | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 71827f53f3..7184825e4f 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.3.0beta1 +- Core: + . Fixed bug #76392 (Error relocating sapi/cli/php: unsupported relocation + type 37). (Peter Kokot) + - FPM: . Fixed bug #62596 (getallheaders() missing with PHP-FPM). (Remi) diff --git a/configure.ac b/configure.ac index 17de4a8f2b..a2445a5a8f 100644 --- a/configure.ac +++ b/configure.ac @@ -581,8 +581,12 @@ AC_TYPE_UID_T dnl Checks for sockaddr_storage and sockaddr.sa_len PHP_SOCKADDR_CHECKS -AX_GCC_FUNC_ATTRIBUTE([ifunc]) -AX_GCC_FUNC_ATTRIBUTE([target]) +dnl Checks for GCC function attributes on all systems except ones without glibc +dnl Fix for these systems is already included in GCC 7, but not on GCC 6 +AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*], [true], [ + AX_GCC_FUNC_ATTRIBUTE([ifunc]) + AX_GCC_FUNC_ATTRIBUTE([target]) +]) dnl Check for IPv6 support AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, -- 2.50.1