Revert "[XRay] ARM 32-bit no-Thumb support in compiler-rt"

This reverts commit r280890, as the related LLVM commit broke the thumb bots.

llvm-svn: 280969

1 files changed, 0 insertions, 22 deletions

diff --git a/compiler-rt/lib/xray/xray_interface_internal.h b/compiler-rt/lib/xray/xray_interface_internal.h
index 3465b67d51c..6208c110e6d 100644
--- a/compiler-rt/lib/xray/xray_interface_internal.h
+++ b/compiler-rt/lib/xray/xray_interface_internal.h
@@ -16,30 +16,18 @@
 #define XRAY_INTERFACE_INTERNAL_H
 
 #include "xray/xray_interface.h"
-#include "sanitizer_common/sanitizer_platform.h"
 #include <cstddef>
 #include <cstdint>
 
 extern "C" {
 
 struct XRaySledEntry {
-#if SANITIZER_WORDSIZE == 64
   uint64_t Address;
   uint64_t Function;
   unsigned char Kind;
   unsigned char AlwaysInstrument;
   unsigned char Padding[14]; // Need 32 bytes
-#elif SANITIZER_WORDSIZE == 32
-  uint32_t Address;
-  uint32_t Function;
-  unsigned char Kind;
-  unsigned char AlwaysInstrument;
-  unsigned char Padding[6]; // Need 16 bytes
-#else
-	#error "Unsupported word size."
-#endif
 };
-
 }
 
 namespace __xray {
@@ -49,16 +37,6 @@ struct XRaySledMap {
   size_t Entries;
 };
 
-bool patchFunctionEntry(const bool Enable, const uint32_t FuncId, const XRaySledEntry& Sled);
-bool patchFunctionExit(const bool Enable, const uint32_t FuncId, const XRaySledEntry& Sled);
-
 } // namespace __xray
 
-extern "C" {
-// The following functions have to be defined in assembler, on a per-platform
-// basis. See xray_trampoline_*.S files for implementations.
-extern void __xray_FunctionEntry();
-extern void __xray_FunctionExit();
-}
-
 #endif