summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFarzon Lotfi <1802579+farzonl@users.noreply.github.com>2023-11-28 13:08:39 -0500
committerGitHub <noreply@github.com>2023-11-28 20:08:39 +0200
commit50b9930cfaa145145c13a89ef59b67efc9a772de (patch)
treead931512a811f4f8464bb4ba0ab0658fde789a1e
parent4667dd62eee3c5d70e47fd45cb8c45d2f1234bff (diff)
[asan] Fix Windows i386 regression (#73650)
This change makes x64 enablement case explicit and adds an else case for 32bit which fixes a regression on Windows i386 asan builds introduced by https://github.com/llvm/llvm-project/pull/66973.
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_platform.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index 49d8a67cc12d..596528155505 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -263,9 +263,12 @@
#if SANITIZER_WINDOWS64 && SANITIZER_ARM64
# define SANITIZER_WINDOWS_ARM64 1
# define SANITIZER_WINDOWS_x64 0
-#else
+#elif SANITIZER_WINDOWS64 && !SANITIZER_ARM64
# define SANITIZER_WINDOWS_ARM64 0
# define SANITIZER_WINDOWS_x64 1
+#else
+# define SANITIZER_WINDOWS_ARM64 0
+# define SANITIZER_WINDOWS_x64 0
#endif
#if SANITIZER_SOLARIS && SANITIZER_WORDSIZE == 32