archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fiber fix wrong asm directives on (default) solaris build mode.

Browse source 
Illumos/Solaris while being 64 bits produces by default 32 bits build.
In this case building the i386 assembly.

Close GH-13320
This commit is contained in:
David Carlier 2024-02-03 21:18:59 +00:00
parent da6a4e799a
commit f9a83a4bd4
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -11,6 +11,7 @@ Core:
(nielsdos)
. Fixed bug GH-13178 (Iterator positions incorrect when converting packed
array to hashed). (ilutov)
. Fixed zend fiber build for solaris default mode (32 bits). (David Carlier)
Curl:
. Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)

16
Zend/asm/jump_x86_64_sysv_elf_gas.S
View file

@ -31,13 +31,16 @@
* *
****************************************************************************************/
# if defined __CET__
# include <cet.h>
# define SHSTK_ENABLED (__CET__ & 0x2)
# define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
# ifdef __i386__
# include "jump_i386_sysv_elf_gas.S"
# else
# define _CET_ENDBR
# endif
# if defined __CET__
# include <cet.h>
# define SHSTK_ENABLED (__CET__ & 0x2)
# define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
# else
# define _CET_ENDBR
# endif
.file "jump_x86_64_sysv_elf_gas.S"
.text
.globl jump_fcontext
@ -148,3 +151,4 @@ jump_fcontext:
/* Mark that we don't need executable stack. */
.section .note.GNU-stack,"",%progbits
# endif

16
Zend/asm/make_x86_64_sysv_elf_gas.S
View file

@ -31,13 +31,16 @@
* *
****************************************************************************************/
# if defined __CET__
# include <cet.h>
# define SHSTK_ENABLED (__CET__ & 0x2)
# define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
# ifdef __i386__
# include "make_i386_sysv_elf_gas.S"
# else
# define _CET_ENDBR
# endif
# if defined __CET__
# include <cet.h>
# define SHSTK_ENABLED (__CET__ & 0x2)
# define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
# else
# define _CET_ENDBR
# endif
.file "make_x86_64_sysv_elf_gas.S"
.text
.globl make_fcontext
@ -184,3 +187,4 @@ finish:
/* Mark that we don't need executable stack. */
.section .note.GNU-stack,"",%progbits
# endif