commit dca5f16269d0a85038276548b1ad76f32df97b8e
author Benjamin Kramer <benny.kra@googlemail.com> Thu Aug 26 11:37:07 2021 +0200
committer Copybara-Service <copybara-worker@google.com> Thu Aug 26 02:40:38 2021 -0700
tree 3e10d05b66ff7e573448cec039d3adad002c4a81
parent e39881622c008b3ae23942d93393913574f3073d

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

These may not exist when CET isn't available.

GitOrigin-RevId: 5ece5562719dde1d8e88fdb41ec5ac0cf6f05274

src/cet_unwind.h

diff --git a/src/cet_unwind.h b/src/cet_unwind.h
index eac0bf1..482e0c8 100644
--- a/src/cet_unwind.h
+++ b/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();                                            \