[pkgsrc/trunk]: pkgsrc/lang/jamvm Use unified asm syntax. Build with -O0 on A...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4ddb7604c49
branches:  trunk
changeset: 649082:c4ddb7604c49
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Mar 31 15:43:34 2015 +0000

description:
Use unified asm syntax. Build with -O0 on ARM when using clang, to much
optimisation potential.

diffstat:

 lang/jamvm/Makefile                                      |   7 ++++++-
 lang/jamvm/distinfo                                      |   3 ++-
 lang/jamvm/patches/patch-src_os_bsd_arm_callNativeEABI.S |  13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r b057d9d08606 -r c4ddb7604c49 lang/jamvm/Makefile
--- a/lang/jamvm/Makefile       Tue Mar 31 15:41:41 2015 +0000
+++ b/lang/jamvm/Makefile       Tue Mar 31 15:43:34 2015 +0000
@@ -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_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 -r b057d9d08606 -r c4ddb7604c49 lang/jamvm/distinfo
--- a/lang/jamvm/distinfo       Tue Mar 31 15:41:41 2015 +0000
+++ b/lang/jamvm/distinfo       Tue Mar 31 15:43:34 2015 +0000
@@ -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 -r b057d9d08606 -r c4ddb7604c49 lang/jamvm/patches/patch-src_os_bsd_arm_callNativeEABI.S
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/jamvm/patches/patch-src_os_bsd_arm_callNativeEABI.S  Tue Mar 31 15:43:34 2015 +0000
@@ -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' */