Hello community,
here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2013-03-22 21:07:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml (Old)
and /work/SRC/openSUSE:Factory/.ocaml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml", Maintainer is "DLovasko(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2013-03-12 06:57:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2013-03-22 21:07:16.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Mar 22 13:52:52 UTC 2013 - dvaleev(a)suse.com
+
+- refresh ocaml-ppc64.patch
+- increase stack size for ppc64
+- package back *cmxs files for ppc
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml.spec ++++++
--- /var/tmp/diff_new_pack.wB3Qpm/_old 2013-03-22 21:07:17.000000000 +0100
+++ /var/tmp/diff_new_pack.wB3Qpm/_new 2013-03-22 21:07:17.000000000 +0100
@@ -264,6 +264,15 @@
# which gets in the way of some of the profiling done within.
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-fomit-frame-pointer/}"
%endif
+
+# For ppc64 we need a larger stack than default to compile some files
+# because the stages in the OCaml compiler are not mutually tail
+# recursive.
+%ifarch ppc64
+ulimit -a
+ulimit -Hs 65536
+ulimit -Ss 65536
+%endif
CFLAGS="$RPM_OPT_FLAGS" \
./configure -bindir %{_bindir} \
-libdir %{_libdir}/ocaml \
@@ -327,7 +336,7 @@
%{_mandir}/*/*
%{_libdir}/ocaml/*.a
%if %{do_opt}
-%ifarch %ix86 ppc64 x86_64
+%ifarch %ix86 ppc ppc64 x86_64
%{_libdir}/ocaml/*.cmxs
%endif
%{_libdir}/ocaml/*.cmxa
++++++ ocaml-ppc64.patch ++++++
--- /var/tmp/diff_new_pack.wB3Qpm/_old 2013-03-22 21:07:17.000000000 +0100
+++ /var/tmp/diff_new_pack.wB3Qpm/_new 2013-03-22 21:07:17.000000000 +0100
@@ -1,7 +1,8 @@
-diff -urN ocaml-4.00.1.orig/asmcomp/power64/arch.ml ocaml-4.00.1/asmcomp/power64/arch.ml
---- ocaml-4.00.1.orig/asmcomp/power64/arch.ml 1970-01-01 08:00:00.000000000 +0800
-+++ ocaml-4.00.1/asmcomp/power64/arch.ml 2013-02-16 22:10:06.156343344 +0800
-@@ -0,0 +1,83 @@
+Index: ocaml-4.00.1/asmcomp/power64/arch.ml
+===================================================================
+--- /dev/null
++++ ocaml-4.00.1/asmcomp/power64/arch.ml
+@@ -0,0 +1,87 @@
+(***********************************************************************)
+(* *)
+(* Objective Caml *)
@@ -47,6 +48,10 @@
+let size_int = size_addr
+let size_float = 8
+
++(* Behavior of division *)
++
++let division_crashes_on_overflow = false
++
+(* Operations on addressing modes *)
+
+let identity_addressing = Iindexed 0
@@ -85,9 +90,10 @@
+ printreg arg.(0) printreg arg.(1) printreg arg.(2)
+ | Ialloc_far n ->
+ fprintf ppf "alloc_far %d" n
-diff -urN ocaml-4.00.1.orig/asmcomp/power64/emit.mlp ocaml-4.00.1/asmcomp/power64/emit.mlp
---- ocaml-4.00.1.orig/asmcomp/power64/emit.mlp 1970-01-01 08:00:00.000000000 +0800
-+++ ocaml-4.00.1/asmcomp/power64/emit.mlp 2013-02-16 22:10:06.163343380 +0800
+Index: ocaml-4.00.1/asmcomp/power64/emit.mlp
+===================================================================
+--- /dev/null
++++ ocaml-4.00.1/asmcomp/power64/emit.mlp
@@ -0,0 +1,989 @@
+(***********************************************************************)
+(* *)
@@ -1078,9 +1084,10 @@
+ ` .quad {emit_int (List.length !frame_descriptors)}\n`;
+ List.iter emit_frame !frame_descriptors;
+ frame_descriptors := []
-diff -urN ocaml-4.00.1.orig/asmcomp/power64/proc.ml ocaml-4.00.1/asmcomp/power64/proc.ml
---- ocaml-4.00.1.orig/asmcomp/power64/proc.ml 1970-01-01 08:00:00.000000000 +0800
-+++ ocaml-4.00.1/asmcomp/power64/proc.ml 2013-02-16 22:10:06.166343395 +0800
+Index: ocaml-4.00.1/asmcomp/power64/proc.ml
+===================================================================
+--- /dev/null
++++ ocaml-4.00.1/asmcomp/power64/proc.ml
@@ -0,0 +1,241 @@
+(***********************************************************************)
+(* *)
@@ -1323,9 +1330,10 @@
+
+open Clflags;;
+open Config;;
-diff -urN ocaml-4.00.1.orig/asmcomp/power64/reload.ml ocaml-4.00.1/asmcomp/power64/reload.ml
---- ocaml-4.00.1.orig/asmcomp/power64/reload.ml 1970-01-01 08:00:00.000000000 +0800
-+++ ocaml-4.00.1/asmcomp/power64/reload.ml 2013-02-16 22:10:06.166343395 +0800
+Index: ocaml-4.00.1/asmcomp/power64/reload.ml
+===================================================================
+--- /dev/null
++++ ocaml-4.00.1/asmcomp/power64/reload.ml
@@ -0,0 +1,18 @@
+(***********************************************************************)
+(* *)
@@ -1345,9 +1353,10 @@
+
+let fundecl f =
+ (new Reloadgen.reload_generic)#fundecl f
-diff -urN ocaml-4.00.1.orig/asmcomp/power64/scheduling.ml ocaml-4.00.1/asmcomp/power64/scheduling.ml
---- ocaml-4.00.1.orig/asmcomp/power64/scheduling.ml 1970-01-01 08:00:00.000000000 +0800
-+++ ocaml-4.00.1/asmcomp/power64/scheduling.ml 2013-02-16 22:10:06.167343401 +0800
+Index: ocaml-4.00.1/asmcomp/power64/scheduling.ml
+===================================================================
+--- /dev/null
++++ ocaml-4.00.1/asmcomp/power64/scheduling.ml
@@ -0,0 +1,65 @@
+(***********************************************************************)
+(* *)
@@ -1414,9 +1423,10 @@
+end
+
+let fundecl f = (new scheduler)#schedule_fundecl f
-diff -urN ocaml-4.00.1.orig/asmcomp/power64/selection.ml ocaml-4.00.1/asmcomp/power64/selection.ml
---- ocaml-4.00.1.orig/asmcomp/power64/selection.ml 1970-01-01 08:00:00.000000000 +0800
-+++ ocaml-4.00.1/asmcomp/power64/selection.ml 2013-02-16 22:10:06.168343406 +0800
+Index: ocaml-4.00.1/asmcomp/power64/selection.ml
+===================================================================
+--- /dev/null
++++ ocaml-4.00.1/asmcomp/power64/selection.ml
@@ -0,0 +1,103 @@
+(***********************************************************************)
+(* *)
@@ -1472,7 +1482,7 @@
+
+method is_immediate n = (n <= 32767) && (n >= -32768)
+
-+method select_addressing exp =
++method select_addressing chunk exp =
+ match select_addr exp with
+ (Asymbol s, d) ->
+ (Ibased(s, d), Ctuple [])
@@ -1521,10 +1531,11 @@
+end
+
+let fundecl f = (new selector)#emit_fundecl f
-diff -urN ocaml-4.00.1.orig/asmrun/Makefile ocaml-4.00.1/asmrun/Makefile
---- ocaml-4.00.1.orig/asmrun/Makefile 2013-02-16 21:54:39.472644964 +0800
-+++ ocaml-4.00.1/asmrun/Makefile 2013-02-16 22:06:21.397193652 +0800
-@@ -89,6 +89,12 @@
+Index: ocaml-4.00.1/asmrun/Makefile
+===================================================================
+--- ocaml-4.00.1.orig/asmrun/Makefile
++++ ocaml-4.00.1/asmrun/Makefile
+@@ -89,6 +89,12 @@ power.o: power-$(SYSTEM).o
power.p.o: power-$(SYSTEM).o
cp power-$(SYSTEM).o power.p.o
@@ -1537,9 +1548,10 @@
main.c: ../byterun/main.c
ln -s ../byterun/main.c main.c
misc.c: ../byterun/misc.c
-diff -urN ocaml-4.00.1.orig/asmrun/power64-elf.S ocaml-4.00.1/asmrun/power64-elf.S
---- ocaml-4.00.1.orig/asmrun/power64-elf.S 1970-01-01 08:00:00.000000000 +0800
-+++ ocaml-4.00.1/asmrun/power64-elf.S 2013-02-16 22:05:07.025814584 +0800
+Index: ocaml-4.00.1/asmrun/power64-elf.S
+===================================================================
+--- /dev/null
++++ ocaml-4.00.1/asmrun/power64-elf.S
@@ -0,0 +1,486 @@
+/*********************************************************************/
+/* */
@@ -2027,9 +2039,10 @@
+ .short 0 /* no roots here */
+ .align 3
+
-diff -urN ocaml-4.00.1.orig/asmrun/stack.h ocaml-4.00.1/asmrun/stack.h
---- ocaml-4.00.1.orig/asmrun/stack.h 2013-02-16 21:54:39.472644964 +0800
-+++ ocaml-4.00.1/asmrun/stack.h 2013-02-16 22:00:58.330552118 +0800
+Index: ocaml-4.00.1/asmrun/stack.h
+===================================================================
+--- ocaml-4.00.1.orig/asmrun/stack.h
++++ ocaml-4.00.1/asmrun/stack.h
@@ -47,6 +47,15 @@
#define Callback_link(sp) ((struct caml_context *)((sp) + Trap_frame_size))
#endif
@@ -2046,18 +2059,19 @@
#ifdef TARGET_arm
#define Saved_return_address(sp) *((intnat *)((sp) - 4))
#define Callback_link(sp) ((struct caml_context *)((sp) + 8))
-diff -urN ocaml-4.00.1.orig/configure ocaml-4.00.1/configure
---- ocaml-4.00.1.orig/configure 2013-02-16 21:54:39.555645380 +0800
-+++ ocaml-4.00.1/configure 2013-02-16 22:00:06.350289275 +0800
-@@ -686,6 +686,7 @@
+Index: ocaml-4.00.1/configure
+===================================================================
+--- ocaml-4.00.1.orig/configure
++++ ocaml-4.00.1/configure
+@@ -686,6 +686,7 @@ case "$host" in
arch=i386; system=macosx
fi;;
i[3456]86-*-gnu*) arch=i386; system=gnu;;
-+ powerpc64-*-linux*) arch=power; model=ppc; system=elf;;
++ powerpc64-*-linux*) arch=power64; model=ppc64; system=elf;;
powerpc*-*-linux*) arch=power; model=ppc; system=elf;;
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;;
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
-@@ -712,7 +713,7 @@
+@@ -712,7 +713,7 @@ esac
if $arch64; then
case "$arch,$model" in
@@ -2066,7 +2080,7 @@
arch=none; model=default; system=unknown;;
esac
fi
-@@ -755,6 +756,8 @@
+@@ -755,6 +756,8 @@ case "$arch,$model,$system" in
aspp='/usr/ccs/bin/as -P';;
i386,*,*) as='as'
aspp='gcc -c';;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org