diff options
| author | joerg <joerg@pkgsrc.org> | 2015-03-31 15:43:34 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-03-31 15:43:34 +0000 |
| commit | 71efd4a9ae83d79591f118e00e041eaea11d4528 (patch) | |
| tree | 85367ac137385ed887d0842816986870a3080328 | |
| parent | 9111c8545a035ab3517185f630dda727c980758f (diff) | |
| download | pkgsrc-71efd4a9ae83d79591f118e00e041eaea11d4528.tar.gz | |
Use unified asm syntax. Build with -O0 on ARM when using clang, to much
optimisation potential.
| -rw-r--r-- | lang/jamvm/Makefile | 7 | ||||
| -rw-r--r-- | lang/jamvm/distinfo | 3 | ||||
| -rw-r--r-- | lang/jamvm/patches/patch-src_os_bsd_arm_callNativeEABI.S | 13 |
3 files changed, 21 insertions, 2 deletions
diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index b17a426f06f..a8edeb9e71b 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/02/08 09:41:29 obache Exp $ +# $NetBSD: Makefile,v 1.12 2015/03/31 15:43:34 joerg Exp $ # DISTNAME= jamvm-1.5.4 @@ -19,6 +19,11 @@ USE_TOOLS+= gmake USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-classpath-install-dir=${PREFIX}/ +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) && ${MACHINE_CPU:U} == "arm" +CFLAGS+= -O0 +.endif + JAVA_NAME= jamvm JAVA_HOME= ${PREFIX}/java/jamvm JAVA_WRAPPERS+= java diff --git a/lang/jamvm/distinfo b/lang/jamvm/distinfo index f532a1d343c..4b3f4d0dab7 100644 --- a/lang/jamvm/distinfo +++ b/lang/jamvm/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.9 2014/02/08 09:41:29 obache Exp $ +$NetBSD: distinfo,v 1.10 2015/03/31 15:43:34 joerg Exp $ SHA1 (jamvm-1.5.4.tar.gz) = 26863c78d5b0dfcc1a1492d24af58d192831b510 RMD160 (jamvm-1.5.4.tar.gz) = 7aa2a3d28c0d953c0d0048a3f8c48dc274ae10a0 Size (jamvm-1.5.4.tar.gz) = 656283 bytes SHA1 (patch-aa) = ba80214425dd11c20ee4412f78c8cf2a60e73b44 SHA1 (patch-src_interp_engine_interp.h) = 335c140573ac49a601697c5fce6ceb182de3e1b4 +SHA1 (patch-src_os_bsd_arm_callNativeEABI.S) = d38aad56051a6f53d05f694b24b10af22dddf2d7 SHA1 (patch-src_os_bsd_x86__64_callNative.S) = 5ed10014c7252b875ac81f387f4fb375b9e70c31 diff --git a/lang/jamvm/patches/patch-src_os_bsd_arm_callNativeEABI.S b/lang/jamvm/patches/patch-src_os_bsd_arm_callNativeEABI.S new file mode 100644 index 00000000000..8aa5fb10aea --- /dev/null +++ b/lang/jamvm/patches/patch-src_os_bsd_arm_callNativeEABI.S @@ -0,0 +1,13 @@ +$NetBSD: patch-src_os_bsd_arm_callNativeEABI.S,v 1.1 2015/03/31 15:43:34 joerg Exp $ + +--- src/os/bsd/arm/callNativeEABI.S.orig 2015-03-27 13:37:56.000000000 +0000 ++++ src/os/bsd/arm/callNativeEABI.S +@@ -63,7 +63,7 @@ scan_sig: + + skip_brackets: + cmp r3, #91 /* '[' */ +- ldreqb r3, [r5], #1 ++ ldrbeq r3, [r5], #1 + beq skip_brackets + + cmp r3, #76 /* 'L' */ |