diff --git a/compiler-rt/lib/asan/asan_win.cpp b/compiler-rt/lib/asan/asan_win.cpp
--- a/compiler-rt/lib/asan/asan_win.cpp
+++ b/compiler-rt/lib/asan/asan_win.cpp
@@ -267,7 +267,6 @@
 
 bool PlatformUnpoisonStacks() { return false; }
 
-#if SANITIZER_WINDOWS64
 // Exception handler for dealing with shadow memory.
 static LONG CALLBACK
 ShadowExceptionHandler(PEXCEPTION_POINTERS exception_pointers) {
@@ -306,14 +305,10 @@
   return EXCEPTION_CONTINUE_EXECUTION;
 }
 
-#endif
-
 void InitializePlatformExceptionHandlers() {
-#if SANITIZER_WINDOWS64
-  // On Win64, we map memory on demand with access violation handler.
+  // On Windows, we map memory on demand with access violation handler.
   // Install our exception handler.
   CHECK(AddVectoredExceptionHandler(TRUE, &ShadowExceptionHandler));
-#endif
 }
 
 bool IsSystemHeapAddress(uptr addr) {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
--- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
@@ -249,7 +249,7 @@
   // FIXME: is this really "NoReserve"? On Win32 this does not matter much,
   // but on Win64 it does.
   (void)name;  // unsupported
-#if !SANITIZER_GO && SANITIZER_WINDOWS64
+#if !SANITIZER_GO
   // On asan/Windows64, use MEM_COMMIT would result in error
   // 1455:ERROR_COMMITMENT_LIMIT.
   // Asan uses exception handler to commit page on demand.