Skip to content

Commit d4c1f22

Browse files
committed
Revert "[sanitizer] Support Intel CET"
This reverts commit fdf4c03. Breaks macOS bots, e.g. https://crbug.com/1257863. Still figuring out if this is actually supported on macOS. Other places that include <cet.h> only do so on Linux.
1 parent f2ad8c9 commit d4c1f22

File tree

5 files changed

+0
-14
lines changed

5 files changed

+0
-14
lines changed

compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
ASM_TYPE_FUNCTION(__interceptor_setjmp)
3636
__interceptor_setjmp:
3737
CFI_STARTPROC
38-
_CET_ENDBR
3938
xorl %esi, %esi
4039
jmp __interceptor_sigsetjmp
4140
CFI_ENDPROC
@@ -45,7 +44,6 @@ ASM_SIZE(__interceptor_setjmp)
4544
ASM_TYPE_FUNCTION(__interceptor_sigsetjmp)
4645
__interceptor_sigsetjmp:
4746
CFI_STARTPROC
48-
_CET_ENDBR
4947

5048
// Save callee save registers.
5149
mov %rbx, (0*8)(%rdi)

compiler-rt/lib/sanitizer_common/sanitizer_asm.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,3 @@
6666
#else
6767
#define NO_EXEC_STACK_DIRECTIVE
6868
#endif
69-
70-
#if defined(__x86_64__) || defined(__i386__)
71-
#include <cet.h>
72-
#endif

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
.globl ASM_WRAPPER_NAME(vfork)
77
ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(vfork))
88
ASM_WRAPPER_NAME(vfork):
9-
_CET_ENDBR
109
// Store return address in the spill area and tear down the stack frame.
1110
sub $12, %esp
1211
call COMMON_INTERCEPTOR_SPILL_AREA

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_x86_64.inc.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
.globl ASM_WRAPPER_NAME(vfork)
77
ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(vfork))
88
ASM_WRAPPER_NAME(vfork):
9-
_CET_ENDBR
109
// Store return address in the spill area and tear down the stack frame.
1110
push %rcx
1211
call COMMON_INTERCEPTOR_SPILL_AREA

compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ ASM_HIDDEN(__tsan_trace_switch)
1313
.globl ASM_SYMBOL(__tsan_trace_switch_thunk)
1414
ASM_SYMBOL(__tsan_trace_switch_thunk):
1515
CFI_STARTPROC
16-
_CET_ENDBR
1716
# Save scratch registers.
1817
push %rax
1918
CFI_ADJUST_CFA_OFFSET(8)
@@ -94,7 +93,6 @@ ASM_HIDDEN(__tsan_report_race)
9493
.globl ASM_SYMBOL(__tsan_report_race_thunk)
9594
ASM_SYMBOL(__tsan_report_race_thunk):
9695
CFI_STARTPROC
97-
_CET_ENDBR
9896
# Save scratch registers.
9997
push %rax
10098
CFI_ADJUST_CFA_OFFSET(8)
@@ -187,7 +185,6 @@ ASM_TYPE_FUNCTION(ASM_SYMBOL_INTERCEPTOR(setjmp))
187185
ASM_SYMBOL_INTERCEPTOR(setjmp):
188186
#endif
189187
CFI_STARTPROC
190-
_CET_ENDBR
191188
// save env parameter
192189
push %rdi
193190
CFI_ADJUST_CFA_OFFSET(8)
@@ -229,7 +226,6 @@ ASM_SIZE(ASM_SYMBOL_INTERCEPTOR(setjmp))
229226
ASM_TYPE_FUNCTION(ASM_SYMBOL_INTERCEPTOR(_setjmp))
230227
ASM_SYMBOL_INTERCEPTOR(_setjmp):
231228
CFI_STARTPROC
232-
_CET_ENDBR
233229
// save env parameter
234230
push %rdi
235231
CFI_ADJUST_CFA_OFFSET(8)
@@ -271,7 +267,6 @@ ASM_TYPE_FUNCTION(ASM_SYMBOL_INTERCEPTOR(sigsetjmp))
271267
ASM_SYMBOL_INTERCEPTOR(sigsetjmp):
272268
#endif
273269
CFI_STARTPROC
274-
_CET_ENDBR
275270
// save env parameter
276271
push %rdi
277272
CFI_ADJUST_CFA_OFFSET(8)
@@ -328,7 +323,6 @@ ASM_SIZE(ASM_SYMBOL_INTERCEPTOR(sigsetjmp))
328323
ASM_TYPE_FUNCTION(ASM_SYMBOL_INTERCEPTOR(__sigsetjmp))
329324
ASM_SYMBOL_INTERCEPTOR(__sigsetjmp):
330325
CFI_STARTPROC
331-
_CET_ENDBR
332326
// save env parameter
333327
push %rdi
334328
CFI_ADJUST_CFA_OFFSET(8)

0 commit comments

Comments
 (0)