---

yaml
---
r: 348619
b: refs/heads/master
c: 3d35249
h: refs/heads/master
i:
  348617: 5673409
  348615: d065364

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 61e126867ca057f74c59fce5e61cadb1c71f5c02
+refs/heads/master: 3d35249f89c3fe731c79fe1e7f74fb3419da8be1
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/stubs/ThreadLocalStorage.cpp

@@ -23,6 +23,8 @@ void _stdlib_destroyTLS(void *);
 SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
 void *_stdlib_createTLS(void);
 
+#if !SWIFT_TLS_HAS_RESERVED_PTHREAD_SPECIFIC || (defined(_WIN32) && !defined(__CYGWIN__))
+
 static void
 #if defined(_M_IX86)
 __stdcall
@@ -31,6 +33,8 @@ destroyTLS_CCAdjustmentThunk(void *ptr) {
   _stdlib_destroyTLS(ptr);
 }
 
+#endif
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 
 typedef