From 808236283028cfbf47fecca818e875c9c6cb702a Mon Sep 17 00:00:00 2001
From: Andrew Noyes <anoyes34@gmail.com>
Date: Thu, 16 May 2019 13:02:06 -0700
Subject: [PATCH 1/2] Hardcode flatbuffers to off for ctest

---
 tests/TestRunner/TestRunner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestRunner/TestRunner.py b/tests/TestRunner/TestRunner.py
index 5fefc8502c..f0e5741830 100755
--- a/tests/TestRunner/TestRunner.py
+++ b/tests/TestRunner/TestRunner.py
@@ -273,7 +273,7 @@ def run_simulation_test(basedir, options):
         pargs.append(os.path.join(args.builddir, 'fdb.cluster'))
     else:
         pargs.append('-S')
-        pargs.append('random')
+        pargs.append('off')
     td = TestDirectory(basedir)
     if options.buggify:
         pargs.append('-b')

From 296adada9373b06453e16b65c8adb79327caf8d2 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <ajbeamon@apple.com>
Date: Thu, 23 May 2019 11:44:54 -0700
Subject: [PATCH 2/2] Use c++11 thread_local instead of redefining it to
 platform specific variants.

---
 bindings/java/fdbJNI.cpp |  6 ------
 flow/Platform.h          | 17 -----------------
 2 files changed, 23 deletions(-)

diff --git a/bindings/java/fdbJNI.cpp b/bindings/java/fdbJNI.cpp
index 3fac730bdb..66191d9755 100644
--- a/bindings/java/fdbJNI.cpp
+++ b/bindings/java/fdbJNI.cpp
@@ -28,14 +28,8 @@
 #define JNI_NULL nullptr 
 
 #if defined(__GNUG__)
-#define thread_local __thread
-// TODO: figure out why the default definition suppresses visibility
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__ ((visibility ("default")))
-#elif defined(_MSC_VER)
-#define thread_local __declspec(thread)
-#else
-#error Missing thread local storage
 #endif
 
 static JavaVM* g_jvm = nullptr; 
diff --git a/flow/Platform.h b/flow/Platform.h
index 291583d2cb..b6183bbc1c 100644
--- a/flow/Platform.h
+++ b/flow/Platform.h
@@ -79,23 +79,6 @@
 #define DISABLE_ZERO_DIVISION_FLAG _Pragma("GCC diagnostic ignored \"-Wdiv-by-zero\"")
 #endif
 
-/*
- * Thread-local storage (but keep in mind any platform-specific
- * restrictions on where this is valid and/or ignored).
- *
- * http://en.wikipedia.org/wiki/Thread-local_storage
- *
- * SOMEDAY: Intel C++ compiler uses g++ syntax on Linux and MSC syntax
- * on Windows.
- */
-#if defined(__GNUG__)
-#define thread_local __thread
-#elif defined(_MSC_VER)
-#define thread_local __declspec(thread)
-#else
-#error Missing thread local storage
-#endif
-
 #if defined(__GNUG__)
 #define force_inline inline __attribute__((__always_inline__))
 #elif defined(_MSC_VER)