Differences From Artifact [b2c96d5bb0]:
- File src/forwarding/forwarding-amd64-macho.S — part of check-in [75d88e0f6e] at 2024-02-24 20:50:51 on branch trunk — Add endbr32 / endbr64 (user: js, size: 4465) [annotate] [blame] [check-ins using]
To Artifact [b0cd93723c]:
- File
src/forwarding/forwarding-amd64-macho.S
— part of check-in
[0b441e52d6]
at
2024-02-26 20:32:38
on branch trunk
— Use <cet.h> and _CET_ENDBR macro
This only uses endbr32/endbr64 when actually needed and emits the
necessary .note.gnu.property. (user: js, size: 4463) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include "platform.h" .globl _OFForward .globl _OFForward_stret .section __TEXT, __text, regular, pure_instructions _OFForward: | > > > > > > | < < | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include "platform.h" #ifdef HAVE_CET_H # include <cet.h> #else # define _CET_ENDBR #endif .globl _OFForward .globl _OFForward_stret .section __TEXT, __text, regular, pure_instructions _OFForward: _CET_ENDBR pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ movq %rax, -0x8(%rbp) |
︙ | ︙ | |||
105 106 107 108 109 110 111 | movq %rbp, %rsp popq %rbp jmp _OFMethodNotFound _OFForward_stret: | | < < | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | movq %rbp, %rsp popq %rbp jmp _OFMethodNotFound _OFForward_stret: _CET_ENDBR pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ movq %rax, -0x8(%rbp) |
︙ | ︙ | |||
194 195 196 197 198 199 200 | movq %rbp, %rsp popq %rbp jmp _OFMethodNotFound_stret Linit: | | < < | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | movq %rbp, %rsp popq %rbp jmp _OFMethodNotFound_stret Linit: _CET_ENDBR leaq Lmodule(%rip), %rdi jmp ___objc_exec_class .section __DATA, __mod_init_func, mod_init_funcs .quad Linit |
︙ | ︙ |