Skip to content

Commit

Permalink
Sync Zend/*_i386_sysv_elf_gas.S with upstream (#15788)
Browse files Browse the repository at this point in the history
This is a sync with upstream already fixed in early 2024 which fixes
64-bit builds on 32-bit hosts. PHP's bundled config.guess sets the
host_alias, for example, on Solaris systems to 64-bit if the compiler
supports it even though the architecture is actually 32-bit. These
assembly files resolve this situation in a build-system-agnostic way by
including the architecture file that is supported by the compiler.
  • Loading branch information
petk authored Sep 7, 2024
1 parent dfe6c13 commit e358634
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Zend/asm/jump_i386_sysv_elf_gas.S
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
* *
****************************************************************************************/

#ifdef __x86_64__
#include "jump_x86_64_sysv_elf_gas.S"
#else

.file "jump_i386_sysv_elf_gas.S"
.text
.globl jump_fcontext
Expand Down Expand Up @@ -91,3 +95,5 @@ jump_fcontext:

/* Mark that we don't need executable stack. */
.section .note.GNU-stack,"",%progbits

#endif
6 changes: 6 additions & 0 deletions Zend/asm/make_i386_sysv_elf_gas.S
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
* *
****************************************************************************************/

#ifdef __x86_64__
#include "make_x86_64_sysv_elf_gas.S"
#else

.file "make_i386_sysv_elf_gas.S"
.text
.globl make_fcontext
Expand Down Expand Up @@ -111,3 +115,5 @@ finish:

/* Mark that we don't need executable stack. */
.section .note.GNU-stack,"",%progbits

#endif

0 comments on commit e358634

Please sign in to comment.