From 2d2ef384b2f6e723edb793d08f52e7f4dc94ba3a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Feb 2022 10:29:33 +0100 Subject: [PATCH] [libunwind] Only include cet.h if __CET__ defined We should not assume that the cet.h header exists just because we're on x86 linux. Only include it if __CET__ is defined. This makes the code more similar to what compiler-rt does in https://github.com/llvm/llvm-project/blob/ee423d93ead39e94c2970b3cc7ef6e6faa75d10b/compiler-rt/lib/builtins/assembly.h#L17 (though that one also has a __has_include() check -- I've not found that to be necessary). Differential Revision: https://reviews.llvm.org/D119697 --- libunwind/src/assembly.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libunwind/src/assembly.h b/libunwind/src/assembly.h index 978f6bd..89293a5 100644 --- a/libunwind/src/assembly.h +++ b/libunwind/src/assembly.h @@ -15,7 +15,7 @@ #ifndef UNWIND_ASSEMBLY_H #define UNWIND_ASSEMBLY_H -#if (defined(__i386__) || defined(__x86_64__)) && defined(__linux__) +#if defined(__linux__) && defined(__CET__) #include #define _LIBUNWIND_CET_ENDBR _CET_ENDBR #else -- 2.7.4