File tree 3 files changed +21
-12
lines changed
3 files changed +21
-12
lines changed Original file line number Diff line number Diff line change 11
11
(nielsdos)
12
12
. Fixed bug GH-13178 (Iterator positions incorrect when converting packed
13
13
array to hashed). (ilutov)
14
+ . Fixed zend fiber build for solaris default mode (32 bits). (David Carlier)
14
15
15
16
Curl:
16
17
. Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
Original file line number Diff line number Diff line change 31
31
* *
32
32
****************************************************************************************/
33
33
34
- # if defined __CET__
35
- # include <cet.h>
36
- # define SHSTK_ENABLED (__CET__ & 0x2 )
37
- # define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
34
+ # ifdef __i386__
35
+ # include "jump_i386_sysv_elf_gas.S"
38
36
# else
39
- # define _CET_ENDBR
40
- # endif
37
+ # if defined __CET__
38
+ # include <cet.h>
39
+ # define SHSTK_ENABLED (__CET__ & 0x2 )
40
+ # define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
41
+ # else
42
+ # define _CET_ENDBR
43
+ # endif
41
44
.file "jump_x86_64_sysv_elf_gas.S"
42
45
.text
43
46
.globl jump_fcontext
@@ -148,3 +151,4 @@ jump_fcontext:
148
151
149
152
/* Mark that we don't need executable stack. */
150
153
.section .note.GNU-stack,"",%progbits
154
+ # endif
Original file line number Diff line number Diff line change 31
31
* *
32
32
****************************************************************************************/
33
33
34
- # if defined __CET__
35
- # include <cet.h>
36
- # define SHSTK_ENABLED (__CET__ & 0x2 )
37
- # define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
34
+ # ifdef __i386__
35
+ # include "make_i386_sysv_elf_gas.S"
38
36
# else
39
- # define _CET_ENDBR
40
- # endif
37
+ # if defined __CET__
38
+ # include <cet.h>
39
+ # define SHSTK_ENABLED (__CET__ & 0x2 )
40
+ # define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
41
+ # else
42
+ # define _CET_ENDBR
43
+ # endif
41
44
.file "make_x86_64_sysv_elf_gas.S"
42
45
.text
43
46
.globl make_fcontext
@@ -184,3 +187,4 @@ finish:
184
187
185
188
/* Mark that we don't need executable stack. */
186
189
.section .note.GNU-stack,"",%progbits
190
+ # endif
You can’t perform that action at this time.
0 commit comments