Enable disabling API-based TLS support.

BUG=swiftshader:7

Change-Id: I0ef3b0ab059bd48e0241eea13a5b77a193351108
Reviewed-on: https://chromium-review.googlesource.com/380275
Reviewed-by: Jim Stichnoth <stichnot@chromium.org>
Tested-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/IceTLS.h b/src/IceTLS.h
index 14865a9..947ae52 100644 (file)
--- a/src/IceTLS.h
+++ b/src/IceTLS.h
@@ -52,8 +52,11 @@
 ///
 /// \def ICE_THREAD_LOCAL_HACK
 ///
-#define ICE_THREAD_LOCAL_HACK
-#ifdef ICE_THREAD_LOCAL_HACK
+#ifndef ICE_THREAD_LOCAL_HACK
+#define ICE_THREAD_LOCAL_HACK 1
+#endif
+
+#if ICE_THREAD_LOCAL_HACK
 
 // For a static thread_local field F of a class C, instead of declaring and
 // defining C::F, we create two static fields:

diff --git a/src/IceTypes.cpp b/src/IceTypes.cpp
index e64d99a..f8cbaf9 100644 (file)
--- a/src/IceTypes.cpp
+++ b/src/IceTypes.cpp
@@ -16,6 +16,8 @@
 
 #include "IceDefs.h"
 
+#include "llvm/Support/ErrorHandling.h"
+
 #include <climits>
 
 namespace Ice {