[compiler-rt] 825e630 - Fixup wwindows.h and parts of wwindows.cpp

[Russell Gallop via llvm-commits]

Author: Russell Gallop
Date: 2021-01-21T16:54:34Z
New Revision: 825e630a7ff9388cfe0bf93a627eb428d9554543

URL: https://github.com/llvm/llvm-project/commit/825e630a7ff9388cfe0bf93a627eb428d9554543
DIFF: https://github.com/llvm/llvm-project/commit/825e630a7ff9388cfe0bf93a627eb428d9554543.diff

LOG: Fixup wwindows.h and parts of wwindows.cpp

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/wwindows.cpp
    compiler-rt/lib/scudo/standalone/wwindows.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/wwindows.cpp b/compiler-rt/lib/scudo/standalone/wwindows.cpp
index 69ffdd9a165b..6bef354e20e1 100644
--- a/compiler-rt/lib/scudo/standalone/wwindows.cpp
+++ b/compiler-rt/lib/scudo/standalone/wwindows.cpp
@@ -1,4 +1,4 @@
-//===-- linux.cpp -----------------------------------------------*- C++ -*-===//
+//===-- wwindows.cpp --------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -8,7 +8,7 @@
 
 #include "platform.h"
 
-#if SCUDO_LINUX
+#if SCUDO_WINDOWS
 
 #include "common.h"
 #include "linux.h"

diff  --git a/compiler-rt/lib/scudo/standalone/wwindows.h b/compiler-rt/lib/scudo/standalone/wwindows.h
index c8e41484c851..f750d948a650 100644
--- a/compiler-rt/lib/scudo/standalone/wwindows.h
+++ b/compiler-rt/lib/scudo/standalone/wwindows.h
@@ -1,4 +1,4 @@
-//===-- linux.h -------------------------------------------------*- C++ -*-===//
+//===-- wwindows.h ----------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,65 +6,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SCUDO_LINUX_H_
-#define SCUDO_LINUX_H_
+#ifndef SCUDO_WWINDOWS_H_
+#define SCUDO_WWINDOWS_H_
 
 #include "platform.h"
 
-#if SCUDO_LINUX
+#if SCUDO_WINDOWS
 
 namespace scudo {
 
-// MapPlatformData is unused on Linux, define it as a minimally sized structure.
+// MapPlatformData is unused on Windows, define it as a minimally sized structure.
 struct MapPlatformData {};
 
-#if SCUDO_ANDROID
-
-#if defined(__aarch64__)
-#define __get_tls()                                                            \
-  ({                                                                           \
-    void **__v;                                                                \
-    __asm__("mrs %0, tpidr_el0" : "=r"(__v));                                  \
-    __v;                                                                       \
-  })
-#elif defined(__arm__)
-#define __get_tls()                                                            \
-  ({                                                                           \
-    void **__v;                                                                \
-    __asm__("mrc p15, 0, %0, c13, c0, 3" : "=r"(__v));                         \
-    __v;                                                                       \
-  })
-#elif defined(__i386__)
-#define __get_tls()                                                            \
-  ({                                                                           \
-    void **__v;                                                                \
-    __asm__("movl %%gs:0, %0" : "=r"(__v));                                    \
-    __v;                                                                       \
-  })
-#elif defined(__x86_64__)
-#define __get_tls()                                                            \
-  ({                                                                           \
-    void **__v;                                                                \
-    __asm__("mov %%fs:0, %0" : "=r"(__v));                                     \
-    __v;                                                                       \
-  })
-#else
-#error "Unsupported architecture."
-#endif
-
-// The Android Bionic team has allocated a TLS slot for sanitizers starting
-// with Q, given that Android currently doesn't support ELF TLS. It is used to
-// store sanitizer thread specific data.
-static const int TLS_SLOT_SANITIZER = 6;
-
-ALWAYS_INLINE uptr *getAndroidTlsPtr() {
-  return reinterpret_cast<uptr *>(&__get_tls()[TLS_SLOT_SANITIZER]);
-}
-
-#endif // SCUDO_ANDROID
-
 } // namespace scudo
 
-#endif // SCUDO_LINUX
+#endif // SCUDO_WINDOWS
 
-#endif // SCUDO_LINUX_H_
+#endif // SCUDO_WWINDOWS_H_