ocaml: update to 4.10.0.
We use --disable-force-safe-string else just too much stuff breaks.
This commit is contained in:
parent
1238ad37d8
commit
298d08fab4
2 changed files with 23 additions and 23 deletions
|
@ -9,8 +9,8 @@
|
||||||
| "ppc64le" -> ELF64v2
|
| "ppc64le" -> ELF64v2
|
||||||
| _ -> assert false
|
| _ -> assert false
|
||||||
|
|
||||||
--- ocaml-4.08.0/runtime/power.S
|
--- ocaml-4.10.0/runtime/power.S
|
||||||
+++ ocaml-4.08.0/runtime/power.S
|
+++ ocaml-4.10.0/runtime/power.S
|
||||||
@@ -13,7 +13,7 @@
|
@@ -13,7 +13,7 @@
|
||||||
/* */
|
/* */
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
.abiversion 2
|
.abiversion 2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -41,8 +41,7 @@
|
@@ -52,8 +52,7 @@
|
||||||
#define TRAP_PREVIOUS_OFFSET 4
|
#define TRAP_PREVIOUS_OFFSET 4
|
||||||
#define CALLBACK_LINK_SIZE 16
|
#define CALLBACK_LINK_SIZE 16
|
||||||
#define CALLBACK_LINK_OFFSET 0
|
#define CALLBACK_LINK_OFFSET 0
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
#define RESERVED_STACK 48
|
#define RESERVED_STACK 48
|
||||||
#define PARAM_SAVE_AREA (8*8)
|
#define PARAM_SAVE_AREA (8*8)
|
||||||
#define LR_SAVE 16
|
#define LR_SAVE 16
|
||||||
@@ -53,8 +52,7 @@
|
@@ -64,8 +63,7 @@
|
||||||
#define TRAP_PREVIOUS_OFFSET 64
|
#define TRAP_PREVIOUS_OFFSET 64
|
||||||
#define CALLBACK_LINK_SIZE 32
|
#define CALLBACK_LINK_SIZE 32
|
||||||
#define CALLBACK_LINK_OFFSET 48
|
#define CALLBACK_LINK_OFFSET 48
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
#define RESERVED_STACK 32
|
#define RESERVED_STACK 32
|
||||||
#define PARAM_SAVE_AREA 0
|
#define PARAM_SAVE_AREA 0
|
||||||
#define LR_SAVE 16
|
#define LR_SAVE 16
|
||||||
@@ -80,9 +78,8 @@
|
@@ -91,9 +89,8 @@
|
||||||
#define ENDFUNCTION(name) \
|
#define ENDFUNCTION(name) \
|
||||||
.size name, . - name
|
.size name, . - name
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@
|
||||||
#define FUNCTION(name) \
|
#define FUNCTION(name) \
|
||||||
.section ".opd","aw"; \
|
.section ".opd","aw"; \
|
||||||
.align 3; \
|
.align 3; \
|
||||||
@@ -96,9 +93,8 @@
|
@@ -107,9 +104,8 @@
|
||||||
#define ENDFUNCTION(name) \
|
#define ENDFUNCTION(name) \
|
||||||
.size name, . - .L.name
|
.size name, . - .L.name
|
||||||
|
|
||||||
|
@ -62,33 +62,33 @@
|
||||||
#define FUNCTION(name) \
|
#define FUNCTION(name) \
|
||||||
.section ".text"; \
|
.section ".text"; \
|
||||||
.globl name; \
|
.globl name; \
|
||||||
@@ -157,7 +153,7 @@
|
@@ -151,7 +147,7 @@
|
||||||
|
|
||||||
#endif
|
#define Caml_state(var) 8*domain_field_caml_##var(28)
|
||||||
|
|
||||||
-#if defined(MODEL_ppc64)
|
-#if defined(MODEL_ppc64)
|
||||||
+#if _CALL_ELF == 1
|
+#if _CALL_ELF == 1
|
||||||
.section ".opd","aw"
|
.section ".opd","aw"
|
||||||
#else
|
#else
|
||||||
.section ".text"
|
.section ".text"
|
||||||
@@ -338,14 +334,14 @@ FUNCTION(caml_c_call)
|
@@ -332,14 +328,14 @@
|
||||||
#if defined(MODEL_ppc)
|
#if defined(MODEL_ppc)
|
||||||
mtctr 28
|
mtctr C_CALL_FUN
|
||||||
bctrl
|
bctrl
|
||||||
-#elif defined(MODEL_ppc64)
|
-#elif defined(MODEL_ppc64)
|
||||||
+#elif _CALL_ELF == 1
|
+#elif _CALL_ELF == 1
|
||||||
ld 0, 0(28)
|
ld 0, 0(C_CALL_FUN)
|
||||||
mr 26, 2 /* save current TOC in a callee-save register */
|
mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */
|
||||||
mtctr 0
|
mtctr 0
|
||||||
ld 2, 8(28)
|
ld 2, 8(C_CALL_FUN)
|
||||||
bctrl
|
bctrl
|
||||||
mr 2, 26 /* restore current TOC */
|
mr 2, C_CALL_TOC /* restore current TOC */
|
||||||
-#elif defined(MODEL_ppc64le)
|
-#elif defined(MODEL_ppc64le)
|
||||||
+#elif _CALL_ELF == 2
|
+#elif _CALL_ELF == 2
|
||||||
mtctr 28
|
mtctr C_CALL_FUN
|
||||||
mr 12, 28
|
mr 12, C_CALL_FUN
|
||||||
mr 26, 2 /* save current TOC in a callee-save register */
|
mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */
|
||||||
@@ -514,14 +510,14 @@ FUNCTION(caml_start_program)
|
@@ -515,14 +511,14 @@
|
||||||
#if defined(MODEL_ppc)
|
#if defined(MODEL_ppc)
|
||||||
mtctr 12
|
mtctr 12
|
||||||
.L105: bctrl
|
.L105: bctrl
|
||||||
|
@ -105,9 +105,9 @@
|
||||||
mtctr 12
|
mtctr 12
|
||||||
std 2, TOC_SAVE(1)
|
std 2, TOC_SAVE(1)
|
||||||
.L105: bctrl
|
.L105: bctrl
|
||||||
@@ -634,7 +630,7 @@ FUNCTION(caml_callback3_exn)
|
@@ -641,7 +637,7 @@
|
||||||
b .L102
|
b .L102
|
||||||
ENDFUNCTION(caml_callback3_exn)
|
ENDFUNCTION(caml_callback3_asm)
|
||||||
|
|
||||||
-#if defined(MODEL_ppc64)
|
-#if defined(MODEL_ppc64)
|
||||||
+#if _CALL_ELF == 1
|
+#if _CALL_ELF == 1
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# Template file for 'ocaml'
|
# Template file for 'ocaml'
|
||||||
pkgname=ocaml
|
pkgname=ocaml
|
||||||
version=4.09.0
|
version=4.10.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style="gnu-configure"
|
build_style="gnu-configure"
|
||||||
configure_args="--with-pic"
|
configure_args="--with-pic --disable-force-safe-string"
|
||||||
make_build_target="world.opt"
|
make_build_target="world.opt"
|
||||||
makedepends="ncurses-devel libX11-devel"
|
makedepends="ncurses-devel libX11-devel"
|
||||||
short_desc="Main implementation of the Caml language"
|
short_desc="Main implementation of the Caml language"
|
||||||
|
@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||||
license="QPL-1.0, LGPL-2.1-only"
|
license="QPL-1.0, LGPL-2.1-only"
|
||||||
homepage="http://ocaml.org/"
|
homepage="http://ocaml.org/"
|
||||||
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
|
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
|
||||||
checksum=a7bc044167e7d09f8e3ea84b88ec9d81392908ecdac861d3d5015e5f0fc496a3
|
checksum=58bae0f0a79daf86ec755a173e593fef4ef588f15c6185993af88ceb9722bc39
|
||||||
nocross=yes
|
nocross=yes
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue