Merge pull request #355 from braddr/win64-changes

changes to build and pass unittests
dlang · Nov 23, 2012 · f19509c · f19509c
2 parents 0937b40 + cef9bd5
commit f19509c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/core/bitop.d b/src/core/bitop.d
@@ -289,13 +289,19 @@ unittest
 {
     version (AsmX86)
     {
+        asm { naked; }
+
         version (D_InlineAsm_X86_64)
-        asm { naked; mov EAX, EDI; }
+        {
+            version (Win64)
+                asm { mov EAX, ECX; }
+            else
+                asm { mov EAX, EDI; }
+        }
 
         asm
         {
             // Author: Tiago Gasiba.
-            naked;
             mov EDX, EAX;
             shr EAX, 1;
             and EDX, 0x5555_5555;

diff --git a/src/core/thread.d b/src/core/thread.d
@@ -4307,6 +4307,9 @@ else
 }
 
 
+version(Win64) {}
+else {
+
 version( unittest )
 {
     class TestFiber : Fiber
@@ -4512,6 +4515,7 @@ unittest
     expect(fib, "delegate");
 }
 
+}
 
 version( AsmX86_64_Posix )
 {

diff --git a/win64.mak b/win64.mak
@@ -889,7 +889,7 @@ $(DRUNTIME): $(OBJS) $(SRCS) win$(MODEL).mak
 	$(DMD) -lib -of$(DRUNTIME) -Xfdruntime.json $(DFLAGS) $(SRCS) $(OBJS)
 
 unittest : $(SRCS) $(DRUNTIME) src\unittest.d
-	$(DMD) $(UDFLAGS) -L/co -version=druntime_unittest -unittest src\unittest.d $(SRCS) $(DRUNTIME) -debuglib=$(DRUNTIME) -defaultlib=$(DRUNTIME)
+	$(DMD) $(UDFLAGS) -version=druntime_unittest -unittest src\unittest.d $(SRCS) $(DRUNTIME) -debuglib=$(DRUNTIME) -defaultlib=$(DRUNTIME) user32.lib
 
 zip: druntime.zip