[libunwind] 5ece556 - [libunwind] Don't include cet.h/immintrin.h unconditionally

[Benjamin Kramer via cfe-commits]

Author: Benjamin Kramer
Date: 2021-08-26T11:37:07+02:00
New Revision: 5ece5562719dde1d8e88fdb41ec5ac0cf6f05274

URL: https://github.com/llvm/llvm-project/commit/5ece5562719dde1d8e88fdb41ec5ac0cf6f05274
DIFF: https://github.com/llvm/llvm-project/commit/5ece5562719dde1d8e88fdb41ec5ac0cf6f05274.diff

LOG: [libunwind] Don't include cet.h/immintrin.h unconditionally

These may not exist when CET isn't available.

Added: 
    

Modified: 
    libunwind/src/cet_unwind.h

Removed: 
    


################################################################################
diff  --git a/libunwind/src/cet_unwind.h b/libunwind/src/cet_unwind.h
index eac0bf12a3a6d..482e0c8086a20 100644
--- a/libunwind/src/cet_unwind.h
+++ b/libunwind/src/cet_unwind.h
@@ -11,8 +11,6 @@
 #define LIBUNWIND_CET_UNWIND_H
 
 #include "libunwind.h"
-#include <cet.h>
-#include <immintrin.h>
 
 // Currently, CET is implemented on Linux x86 platforms.
 #if defined(_LIBUNWIND_TARGET_LINUX) && defined(__CET__) && defined(__SHSTK__)
@@ -20,6 +18,9 @@
 #endif
 
 #if defined(_LIBUNWIND_USE_CET)
+#include <cet.h>
+#include <immintrin.h>
+
 #define _LIBUNWIND_POP_CET_SSP(x)                                              \
   do {                                                                         \
     unsigned long ssp = _get_ssp();                                            \