Merge pull request #14 from kinke/misc

Misc. fixes/workarounds for MSVC targets

Author: kinke

Makefile

@@ -225,10 +225,11 @@ DISABLED_TESTS += testclass
 DISABLED_SH_TESTS += test_shared
 
 # LDC: OS X ld needs extra options, but not needed so do not bother
+#      not supported for MSVC either
 ifeq ($(OS),osx)
 DISABLED_TESTS += ldc_extern_weak
 endif
-ifeq ($(OS),win64)
+ifeq ($(findstring win,$(OS)),win)
 DISABLED_TESTS += ldc_extern_weak
 endif
 

runnable/mars1.d

@@ -794,23 +794,26 @@ struct S8658
     int[16385] a;
 }
 
+// LDC_FIXME: The LLVM x86 backend suffers from this as well - an
+//            argument's size in bytes seems to be limited to 16 bits.
+version (LDC) version (X86) version = LDC_X86;
+
+version (LDC_X86) {} else
+{
 void foo8658(S8658 s)
 {
     int x;
 }
+}
 
 void test8658()
 {
     S8658 s;
-version (LDC)
-{
-    // LDC_FIXME: The LLVM x86 backend suffers from this as well.
-}
-else
-{
+  version (LDC_X86) {} else
+  {
     for(int i = 0; i < 1000; i++)
         foo8658(s);
-}
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////

runnable/test22.d

@@ -15,6 +15,9 @@ extern(C)
         int snprintf(char*, size_t, const char*, ...);
 }
 
+version (LDC) static if (real.mant_dig != 64)
+    version = LDC_NoX87;
+
 /*************************************/
 
 // http://www.digitalmars.com/d/archives/digitalmars/D/bugs/4766.html
@@ -237,7 +240,8 @@ void assertEqual(real* a, real* b, string file = __FILE__, size_t line = __LINE_
 
     // Only compare the 10 value bytes, the padding bytes are of undefined
     // value.
-    version (X86) enum count = 10;
+    version (LDC_NoX87) enum count = real.sizeof;
+    else version (X86) enum count = 10;
     else version (X86_64) enum count = 10;
     else enum count = real.sizeof;
     for (size_t i = 0; i < count; i++)
@@ -922,7 +926,11 @@ in
 }
 body
 {
-    version (D_InlineAsm_X86)
+    version (LDC_NoX87)
+    {
+        return 0;
+    }
+    else version (D_InlineAsm_X86)
     {
 	version (linux)
 	{
@@ -1078,6 +1086,7 @@ void test47()
 
     r = (56.1L + (32.7L + 6L * x) * x);
     assert(r == poly_c(x, pp));
+  version (LDC_NoX87) {} else
     version (D_InlineAsm_X86)
         assert(r == poly_asm(x, pp));
     assert(r == poly(x, pp));