summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2014-11-21 14:15:20 +0000
committerjoerg <joerg@pkgsrc.org>2014-11-21 14:15:20 +0000
commitd6f287ab6938d204c37e6c828596ccaca30194a9 (patch)
tree726e198ab653c093992613502697261f5095e4db /lang
parent7ce304d005b3015c694705a83699a3f57a4b5f29 (diff)
downloadpkgsrc-d6f287ab6938d204c37e6c828596ccaca30194a9.tar.gz
ARM assembler glue needs either Thumb or ARMv6 with emulation for one
Thumb instruction. Go with FreeBSD and use the latter.
Diffstat (limited to 'lang')
-rw-r--r--lang/ocaml/distinfo3
-rw-r--r--lang/ocaml/patches/patch-asmrun_arm.S13
2 files changed, 15 insertions, 1 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 79c974d4632..a9b8b281c80 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2014/10/13 13:24:45 jaapb Exp $
+$NetBSD: distinfo,v 1.78 2014/11/21 14:15:20 joerg Exp $
SHA1 (ocaml-4.02.0.tar.gz) = 402d730d1c9b5e45b327a0b3fc61a24dff08a747
RMD160 (ocaml-4.02.0.tar.gz) = 59c72f1378565d49e86be6723506d5b1e2eb376b
@@ -6,6 +6,7 @@ Size (ocaml-4.02.0.tar.gz) = 3048921 bytes
SHA1 (patch-Makefile) = 0aea370689374398924724f1989158dc061c2a18
SHA1 (patch-asmcomp_power_emit.mlp) = 726e09e4902b96f4790c7a8093eb245dd7028bf4
SHA1 (patch-asmrun_Makefile) = b6301628b71e3fe3553f32342805ae90159cc773
+SHA1 (patch-asmrun_arm.S) = 5b06bb12190bfe7a003787098ddecc5b63e708c1
SHA1 (patch-asmrun_power-bsd.S) = 5428a486835a0254a1768b3157b6b1fdf5ae8dd3
SHA1 (patch-asmrun_signals_osdep.h) = d9dba52a3e1e0170976e64a1ef1860aa5ab560ae
SHA1 (patch-byterun_Makefile) = 2b88b35e5ffcccc315542cb814b9e826126acb54
diff --git a/lang/ocaml/patches/patch-asmrun_arm.S b/lang/ocaml/patches/patch-asmrun_arm.S
new file mode 100644
index 00000000000..7f659da2198
--- /dev/null
+++ b/lang/ocaml/patches/patch-asmrun_arm.S
@@ -0,0 +1,13 @@
+$NetBSD: patch-asmrun_arm.S,v 1.1 2014/11/21 14:15:20 joerg Exp $
+
+--- asmrun/arm.S.orig 2014-11-20 13:12:25.000000000 +0000
++++ asmrun/arm.S
+@@ -44,7 +44,7 @@
+ cmp \reg, #0
+ beq \lbl
+ .endm
+-#elif defined(SYS_freebsd)
++#elif defined(SYS_freebsd) || defined(SYS_netbsd)
+ .arch armv6
+ .arm
+