aboutsummaryrefslogtreecommitdiff
path: root/compiler-rt/lib
diff options
context:
space:
mode:
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/builtins/assembly.h3
-rw-r--r--compiler-rt/lib/builtins/gcc_personality_v0.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h
index 79a45d91..ac119af 100644
--- a/compiler-rt/lib/builtins/assembly.h
+++ b/compiler-rt/lib/builtins/assembly.h
@@ -337,7 +337,8 @@
#endif
#endif
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__ASSEMBLER__) && (defined(__i386__) || defined(__amd64__)) && \
+ !defined(__arm64ec__)
.att_syntax
#endif
diff --git a/compiler-rt/lib/builtins/gcc_personality_v0.c b/compiler-rt/lib/builtins/gcc_personality_v0.c
index 3ed17fa..6d92a7b 100644
--- a/compiler-rt/lib/builtins/gcc_personality_v0.c
+++ b/compiler-rt/lib/builtins/gcc_personality_v0.c
@@ -30,6 +30,10 @@ EXCEPTION_DISPOSITION _GCC_specific_handler(PEXCEPTION_RECORD, void *, PCONTEXT,
_Unwind_Personality_Fn);
#endif
+#ifndef __has_feature
+#define __has_feature(__feature) 0
+#endif
+
#if __has_feature(ptrauth_calls)
#include <ptrauth.h>