[144928] trunk/dports/lang/MoarVM

[mojca at macports.org]

Revision: 144928
          https://trac.macports.org/changeset/144928
Author:   mojca at macports.org
Date:     2016-01-21 07:30:57 -0800 (Thu, 21 Jan 2016)
Log Message:
-----------
moarvm: disable jit in i386 at runtime (upstream patch, closes #50169)

Modified Paths:
--------------
    trunk/dports/lang/MoarVM/Portfile

Added Paths:
-----------
    trunk/dports/lang/MoarVM/files/
    trunk/dports/lang/MoarVM/files/patch-src-jit-emit_x64.dasc.diff

Modified: trunk/dports/lang/MoarVM/Portfile
===================================================================
--- trunk/dports/lang/MoarVM/Portfile	2016-01-21 15:30:25 UTC (rev 144927)
+++ trunk/dports/lang/MoarVM/Portfile	2016-01-21 15:30:57 UTC (rev 144928)
@@ -5,7 +5,7 @@
 
 name                MoarVM
 version             2015.12
-revision            1
+revision            2
 categories          lang devel
 platforms           darwin
 license             Artistic-2 MIT BSD ISC public-domain
@@ -24,14 +24,10 @@
 
 depends_build       port:perl5
 
+# https://github.com/MoarVM/MoarVM/issues/324
+patchfiles          patch-src-jit-emit_x64.dasc.diff
+
 configure.cmd       ${prefix}/bin/perl Configure.pl
 
 # Unsupported by Configure.pl
 configure.universal_args-delete --disable-dependency-tracking
-# JIT is not supported on anything but x86_64
-# (and universal builds would need a special treatment)
-# automatic disabling of JIT should be implemented/fixed upstream
-# https://github.com/MoarVM/MoarVM/issues/324
-if {[variant_isset universal] || ${configure.build_arch} ne "x86_64"} {
-    configure.args-append --no-jit
-}

Added: trunk/dports/lang/MoarVM/files/patch-src-jit-emit_x64.dasc.diff
===================================================================
--- trunk/dports/lang/MoarVM/files/patch-src-jit-emit_x64.dasc.diff	                        (rev 0)
+++ trunk/dports/lang/MoarVM/files/patch-src-jit-emit_x64.dasc.diff	2016-01-21 15:30:57 UTC (rev 144928)
@@ -0,0 +1,21 @@
+https://github.com/MoarVM/MoarVM/issues/324
+https://github.com/MoarVM/MoarVM/commit/6ae4e7fdb82b147df79109f5567d77300c5a6e78
+
+--- src/jit/emit_x64.dasc.orig
++++ src/jit/emit_x64.dasc
+@@ -61,7 +61,15 @@
+ 
+ 
+ const MVMint32 MVM_jit_support(void) {
++#ifdef __i386__
++    /* Usually, this file should only be compiled only on a amd64
++       platform; but when compiling 'fat' or 'universal' binaries, we
++       may compile it for other platform. In this case we use the
++       runtime check to disable the JIT */
++    return 0;
++#else
+     return 1;
++#endif
+ }
+ 
+ const unsigned char * MVM_jit_actions(void) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160121/5cef88b3/attachment.html>