Index: tests/OFBlockTests.m
==================================================================
--- tests/OFBlockTests.m
+++ tests/OFBlockTests.m
@@ -27,11 +27,14 @@
 extern void *_NSConcreteStackBlock;
 extern void *_NSConcreteGlobalBlock;
 extern void *_NSConcreteMallocBlock;
 #endif
 
+/* Clang on Win32 generates broken code that crashes for global blocks. */
+#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
 static void (^globalBlock)(void) = ^ {};
+#endif
 
 static int
 (^returnStackBlock(void))(void)
 {
 	__block int i = 42;
@@ -67,15 +70,11 @@
 
 	TEST(@"Class of stack block",
 	    (Class)&_NSConcreteStackBlock == objc_getClass("OFStackBlock") &&
 	    [stackBlock isKindOfClass: [OFBlock class]])
 
-#if !defined(OF_WINDOWS) || !defined(__clang__) || !defined(OF_NO_SHARED)
-	/*
-	 * Causes a linker error on Windows with Clang when compiling as a
-	 * static library. This is a bug in Clang.
-	 */
+#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
 	TEST(@"Class of global block",
 	    (Class)&_NSConcreteGlobalBlock == objc_getClass("OFGlobalBlock") &&
 	    [globalBlock isKindOfClass: [OFBlock class]])
 #endif
 
@@ -92,25 +91,29 @@
 
 	TEST(@"Copying a stack block and using its copied variable",
 	    (voidBlock = returnStackBlock()) && voidBlock() == 43 &&
 	    voidBlock() == 44 && voidBlock() == 45)
 
+#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
 	TEST(@"Copying a global block",
 	    (id)globalBlock == [[globalBlock copy] autorelease])
+#endif
 
 #ifndef __clang_analyzer__
 	TEST(@"Copying a malloc block",
 	    (id)mallocBlock == [mallocBlock copy] &&
 	    [mallocBlock retainCount] == 2)
 #endif
 
 	TEST(@"Autorelease a stack block", R([stackBlock autorelease]))
 
+#if !defined(OF_WINDOWS) || !defined(OF_X86) || !defined(__clang__)
 	TEST(@"Autorelease a global block", R([globalBlock autorelease]))
+#endif
 
 #ifndef __clang_analyzer__
 	TEST(@"Autorelease a malloc block", R([mallocBlock autorelease]))
 #endif
 
 	objc_autoreleasePoolPop(pool);
 }
 @end