[127118] trunk/dports/emulators/dosbox

[ryandesign at macports.org]

Revision: 127118
          https://trac.macports.org/changeset/127118
Author:   ryandesign at macports.org
Date:     2014-10-21 09:29:37 -0700 (Tue, 21 Oct 2014)
Log Message:
-----------
dosbox: fix build with clang (#40789, #45535)

Modified Paths:
--------------
    trunk/dports/emulators/dosbox/Portfile

Added Paths:
-----------
    trunk/dports/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h.diff

Modified: trunk/dports/emulators/dosbox/Portfile
===================================================================
--- trunk/dports/emulators/dosbox/Portfile	2014-10-21 14:32:26 UTC (rev 127117)
+++ trunk/dports/emulators/dosbox/Portfile	2014-10-21 16:29:37 UTC (rev 127118)
@@ -34,14 +34,13 @@
 }
 
 # src__cpu__core_dynrec__risc_x64.h.diff: http://www.freebsd.org/cgi/query-pr.cgi?pr=164243
-patchfiles          3689.diff 3694.diff 3776.diff 3777.diff src__cpu__core_dynrec__risc_x64.h.diff
+patchfiles          3689.diff 3694.diff 3776.diff 3777.diff \
+                    patch-src-fpu-fpu_instructions_x86.h.diff \
+                    src__cpu__core_dynrec__risc_x64.h.diff
 
 # Assembly language issues
 universal_variant no
 
-# error: ambiguous instructions require an explicit suffix
-compiler.blacklist  *clang*
-
 use_autoreconf      yes
 autoreconf.args     -fvi
 

Added: trunk/dports/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h.diff
===================================================================
--- trunk/dports/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h.diff	                        (rev 0)
+++ trunk/dports/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h.diff	2014-10-21 16:29:37 UTC (rev 127118)
@@ -0,0 +1,28 @@
+Index: src/fpu/fpu_instructions_x86.h
+===================================================================
+--- src/fpu/fpu_instructions_x86.h	(revision 3833)
++++ src/fpu/fpu_instructions_x86.h	(working copy)
+@@ -1161,12 +1161,12 @@
+ 
+ static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
+ 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
+-	FPUD_LOAD(fild,WORD,)
++	FPUD_LOAD(fild,WORD,s)
+ }
+ 
+ static void FPU_FLD_I16_EA(PhysPt addr) {
+ 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
+-	FPUD_LOAD_EA(fild,WORD,)
++	FPUD_LOAD_EA(fild,WORD,s)
+ }
+ 
+ static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
+@@ -1211,7 +1211,7 @@
+ }
+ 
+ static void FPU_FST_I16(PhysPt addr) {
+-	FPUD_STORE(fistp,WORD,)
++	FPUD_STORE(fistp,WORD,s)
+ 	mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
+ }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141021/9cd5edc9/attachment-0001.html>