Skip to content

Commit 67352cb

Browse files
petknikic
authored andcommitted
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.
1 parent 04e3523 commit 67352cb

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.3.0beta1
44

5+
- Core:
6+
. Fixed bug #76392 (Error relocating sapi/cli/php: unsupported relocation
7+
type 37). (Peter Kokot)
8+
59
- FPM:
610
. Fixed bug #62596 (getallheaders() missing with PHP-FPM). (Remi)
711

configure.ac

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,12 @@ AC_TYPE_UID_T
581581
dnl Checks for sockaddr_storage and sockaddr.sa_len
582582
PHP_SOCKADDR_CHECKS
583583

584-
AX_GCC_FUNC_ATTRIBUTE([ifunc])
585-
AX_GCC_FUNC_ATTRIBUTE([target])
584+
dnl Checks for GCC function attributes on all systems except ones without glibc
585+
dnl Fix for these systems is already included in GCC 7, but not on GCC 6
586+
AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*], [true], [
587+
AX_GCC_FUNC_ATTRIBUTE([ifunc])
588+
AX_GCC_FUNC_ATTRIBUTE([target])
589+
])
586590

587591
dnl Check for IPv6 support
588592
AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,

0 commit comments

Comments
 (0)