Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2015-07-05 17:55:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml" Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2014-10-29 21:09:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2015-07-05 17:55:31.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 23 08:50:31 UTC 2015 - oher...@suse.de + +- update version 4.02.2 + * http://caml.inria.fr/pub/distrib/ocaml-4.02/notes/Changes + +------------------------------------------------------------------- Old: ---- ocaml-4.02.1.tar.xz New: ---- ocaml-4.02.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.60mTd9/_old 2015-07-05 17:55:32.000000000 +0200 +++ /var/tmp/diff_new_pack.60mTd9/_new 2015-07-05 17:55:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail dot com> # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com> # @@ -19,7 +19,7 @@ Name: ocaml -Version: 4.02.1 +Version: 4.02.2 Release: 0 %define doc_version 4.02 # @@ -328,6 +328,9 @@ %endif %{_libdir}/ocaml/*.mli %{_libdir}/ocaml/libcamlrun_shared.so +%if %{do_opt} +%{_libdir}/ocaml/libasmrun_shared.so +%endif %{_libdir}/ocaml/vmthreads/*.mli %{_libdir}/ocaml/vmthreads/*.a %if %{do_opt} ++++++ ocaml-4.02.1.tar.xz -> ocaml-4.02.2.tar.xz ++++++ ++++ 32974 lines of diff (skipped) ++++++ ocaml-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.60mTd9/_old 2015-07-05 17:55:33.000000000 +0200 +++ /var/tmp/diff_new_pack.60mTd9/_new 2015-07-05 17:55:33.000000000 +0200 @@ -26,11 +26,11 @@ asmcomp/power64/reload.ml | 18 asmcomp/power64/scheduling.ml | 63 ++ asmcomp/power64/selection.ml | 93 +++ - asmrun/Makefile | 6 + asmrun/Makefile | 9 asmrun/power64-elf.S | 486 ++++++++++++++++++++ asmrun/stack.h | 9 configure | 3 - 11 files changed, 2036 insertions(+) + 11 files changed, 2039 insertions(+) create mode 100644 asmcomp/power64/arch.ml create mode 100644 asmcomp/power64/emit.mlp create mode 100644 asmcomp/power64/proc.ml @@ -39,10 +39,10 @@ create mode 100644 asmcomp/power64/selection.ml create mode 100644 asmrun/power64-elf.S -Index: ocaml-4.02.0/asmcomp/power64/CSE.ml +Index: ocaml-4.02.2/asmcomp/power64/CSE.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64/CSE.ml ++++ ocaml-4.02.2/asmcomp/power64/CSE.ml @@ -0,0 +1,37 @@ +(***********************************************************************) +(* *) @@ -81,10 +81,10 @@ + +let fundecl f = + (new cse)#fundecl f -Index: ocaml-4.02.0/asmcomp/power64/arch.ml +Index: ocaml-4.02.2/asmcomp/power64/arch.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64/arch.ml ++++ ocaml-4.02.2/asmcomp/power64/arch.ml @@ -0,0 +1,88 @@ +(***********************************************************************) +(* *) @@ -174,10 +174,10 @@ + printreg arg.(0) printreg arg.(1) printreg arg.(2) + | Ialloc_far n -> + fprintf ppf "alloc_far %d" n -Index: ocaml-4.02.0/asmcomp/power64/emit.mlp +Index: ocaml-4.02.2/asmcomp/power64/emit.mlp =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64/emit.mlp ++++ ocaml-4.02.2/asmcomp/power64/emit.mlp @@ -0,0 +1,978 @@ +(***********************************************************************) +(* *) @@ -1157,10 +1157,10 @@ + ` .quad {emit_int (List.length !frame_descriptors)}\n`; + List.iter emit_frame !frame_descriptors; + frame_descriptors := [] -Index: ocaml-4.02.0/asmcomp/power64/proc.ml +Index: ocaml-4.02.2/asmcomp/power64/proc.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64/proc.ml ++++ ocaml-4.02.2/asmcomp/power64/proc.ml @@ -0,0 +1,255 @@ +(***********************************************************************) +(* *) @@ -1417,10 +1417,10 @@ + Filename.quote outfile ^ " " ^ Filename.quote infile) + +let init () = () -Index: ocaml-4.02.0/asmcomp/power64/reload.ml +Index: ocaml-4.02.2/asmcomp/power64/reload.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64/reload.ml ++++ ocaml-4.02.2/asmcomp/power64/reload.ml @@ -0,0 +1,18 @@ +(***********************************************************************) +(* *) @@ -1440,10 +1440,10 @@ + +let fundecl f = + (new Reloadgen.reload_generic)#fundecl f -Index: ocaml-4.02.0/asmcomp/power64/scheduling.ml +Index: ocaml-4.02.2/asmcomp/power64/scheduling.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64/scheduling.ml ++++ ocaml-4.02.2/asmcomp/power64/scheduling.ml @@ -0,0 +1,63 @@ +(***********************************************************************) +(* *) @@ -1508,10 +1508,10 @@ +end + +let fundecl f = (new scheduler)#schedule_fundecl f -Index: ocaml-4.02.0/asmcomp/power64/selection.ml +Index: ocaml-4.02.2/asmcomp/power64/selection.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64/selection.ml ++++ ocaml-4.02.2/asmcomp/power64/selection.ml @@ -0,0 +1,93 @@ +(***********************************************************************) +(* *) @@ -1606,13 +1606,13 @@ +end + +let fundecl f = (new selector)#emit_fundecl f -Index: ocaml-4.02.0/asmrun/Makefile +Index: ocaml-4.02.2/asmrun/Makefile =================================================================== ---- ocaml-4.02.0.orig/asmrun/Makefile -+++ ocaml-4.02.0/asmrun/Makefile -@@ -93,6 +93,12 @@ power.o: power-$(SYSTEM).o - power.p.o: power-$(SYSTEM).o - cp power-$(SYSTEM).o power.p.o +--- ocaml-4.02.2.orig/asmrun/Makefile ++++ ocaml-4.02.2/asmrun/Makefile +@@ -122,6 +122,15 @@ power.p.o: power-$(SYSTEM).o + power.pic.o: power-$(SYSTEM).pic.o + cp power-$(SYSTEM).pic.o power.pic.o +power64.o: power64-$(SYSTEM).o + cp power64-$(SYSTEM).o power64.o @@ -1620,13 +1620,16 @@ +power64.p.o: power64-$(SYSTEM).o + cp power64-$(SYSTEM).o power64.p.o + ++power64.pic.o: power64-$(SYSTEM).pic.o ++ cp power64-$(SYSTEM).pic.o power64.pic.o ++ main.c: ../byterun/main.c ln -s ../byterun/main.c main.c misc.c: ../byterun/misc.c -Index: ocaml-4.02.0/asmrun/power64-elf.S +Index: ocaml-4.02.2/asmrun/power64-elf.S =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmrun/power64-elf.S ++++ ocaml-4.02.2/asmrun/power64-elf.S @@ -0,0 +1,486 @@ +/*********************************************************************/ +/* */ @@ -2114,10 +2117,10 @@ + .short 0 /* no roots here */ + .align 3 + -Index: ocaml-4.02.0/asmrun/stack.h +Index: ocaml-4.02.2/asmrun/stack.h =================================================================== ---- ocaml-4.02.0.orig/asmrun/stack.h -+++ ocaml-4.02.0/asmrun/stack.h +--- ocaml-4.02.2.orig/asmrun/stack.h ++++ ocaml-4.02.2/asmrun/stack.h @@ -46,6 +46,15 @@ #define Callback_link(sp) ((struct caml_context *)((sp) + Trap_frame_size)) #endif @@ -2134,11 +2137,11 @@ #ifdef TARGET_arm #define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) -Index: ocaml-4.02.0/configure +Index: ocaml-4.02.2/configure =================================================================== ---- ocaml-4.02.0.orig/configure -+++ ocaml-4.02.0/configure -@@ -808,6 +808,7 @@ case "$target" in +--- ocaml-4.02.2.orig/configure ++++ ocaml-4.02.2/configure +@@ -843,6 +843,7 @@ case "$target" in fi;; i[3456]86-*-gnu*) arch=i386; system=gnu;; i[3456]86-*-mingw*) arch=i386; system=mingw;; @@ -2146,7 +2149,7 @@ powerpc*-*-linux*) arch=power; model=ppc; system=elf;; powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; -@@ -888,6 +889,8 @@ case "$arch,$system" in +@@ -923,6 +924,8 @@ case "$arch,$system" in aspp="/usr/ccs/bin/${TOOLPREF}as -P";; power,elf) as="${TOOLPREF}as -u -m ppc" aspp="${TOOLPREF}gcc -c";; ++++++ ocaml-ppc64le.patch ++++++ --- /var/tmp/diff_new_pack.60mTd9/_old 2015-07-05 17:55:33.000000000 +0200 +++ /var/tmp/diff_new_pack.60mTd9/_new 2015-07-05 17:55:33.000000000 +0200 @@ -12,17 +12,17 @@ asmcomp/power64le/reload.ml | 18 asmcomp/power64le/scheduling.ml | 63 ++ asmcomp/power64le/selection.ml | 93 +++ - asmrun/Makefile | 6 + asmrun/Makefile | 9 asmrun/power64-elf.S | 93 +++ asmrun/power64le-elf.S | 579 +++++++++++++++++++++++ asmrun/stack.h | 9 configure | 3 - 12 files changed, 2215 insertions(+) + 12 files changed, 2218 insertions(+) -Index: ocaml-4.02.0/asmcomp/power64le/CSE.ml +Index: ocaml-4.02.2/asmcomp/power64le/CSE.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64le/CSE.ml ++++ ocaml-4.02.2/asmcomp/power64le/CSE.ml @@ -0,0 +1,37 @@ +(***********************************************************************) +(* *) @@ -61,10 +61,10 @@ + +let fundecl f = + (new cse)#fundecl f -Index: ocaml-4.02.0/asmcomp/power64le/arch.ml +Index: ocaml-4.02.2/asmcomp/power64le/arch.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64le/arch.ml ++++ ocaml-4.02.2/asmcomp/power64le/arch.ml @@ -0,0 +1,88 @@ +(***********************************************************************) +(* *) @@ -154,10 +154,10 @@ + printreg arg.(0) printreg arg.(1) printreg arg.(2) + | Ialloc_far n -> + fprintf ppf "alloc_far %d" n -Index: ocaml-4.02.0/asmcomp/power64le/emit.mlp +Index: ocaml-4.02.2/asmcomp/power64le/emit.mlp =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64le/emit.mlp ++++ ocaml-4.02.2/asmcomp/power64le/emit.mlp @@ -0,0 +1,971 @@ +(***********************************************************************) +(* *) @@ -1130,10 +1130,10 @@ + ` .quad {emit_int (List.length !frame_descriptors)}\n`; + List.iter emit_frame !frame_descriptors; + frame_descriptors := [] -Index: ocaml-4.02.0/asmcomp/power64le/proc.ml +Index: ocaml-4.02.2/asmcomp/power64le/proc.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64le/proc.ml ++++ ocaml-4.02.2/asmcomp/power64le/proc.ml @@ -0,0 +1,255 @@ +(***********************************************************************) +(* *) @@ -1390,10 +1390,10 @@ + Filename.quote outfile ^ " " ^ Filename.quote infile) + +let init () = () -Index: ocaml-4.02.0/asmcomp/power64le/reload.ml +Index: ocaml-4.02.2/asmcomp/power64le/reload.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64le/reload.ml ++++ ocaml-4.02.2/asmcomp/power64le/reload.ml @@ -0,0 +1,18 @@ +(***********************************************************************) +(* *) @@ -1413,10 +1413,10 @@ + +let fundecl f = + (new Reloadgen.reload_generic)#fundecl f -Index: ocaml-4.02.0/asmcomp/power64le/scheduling.ml +Index: ocaml-4.02.2/asmcomp/power64le/scheduling.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64le/scheduling.ml ++++ ocaml-4.02.2/asmcomp/power64le/scheduling.ml @@ -0,0 +1,63 @@ +(***********************************************************************) +(* *) @@ -1481,10 +1481,10 @@ +end + +let fundecl f = (new scheduler)#schedule_fundecl f -Index: ocaml-4.02.0/asmcomp/power64le/selection.ml +Index: ocaml-4.02.2/asmcomp/power64le/selection.ml =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmcomp/power64le/selection.ml ++++ ocaml-4.02.2/asmcomp/power64le/selection.ml @@ -0,0 +1,93 @@ +(***********************************************************************) +(* *) @@ -1579,13 +1579,13 @@ +end + +let fundecl f = (new selector)#emit_fundecl f -Index: ocaml-4.02.0/asmrun/Makefile +Index: ocaml-4.02.2/asmrun/Makefile =================================================================== ---- ocaml-4.02.0.orig/asmrun/Makefile -+++ ocaml-4.02.0/asmrun/Makefile -@@ -99,6 +99,12 @@ power64.o: power64-$(SYSTEM).o - power64.p.o: power64-$(SYSTEM).o - cp power64-$(SYSTEM).o power64.p.o +--- ocaml-4.02.2.orig/asmrun/Makefile ++++ ocaml-4.02.2/asmrun/Makefile +@@ -131,6 +131,15 @@ power64.p.o: power64-$(SYSTEM).o + power64.pic.o: power64-$(SYSTEM).pic.o + cp power64-$(SYSTEM).pic.o power64.pic.o +power64le.o: power64le-$(SYSTEM).o + cp power64le-$(SYSTEM).o power64le.o @@ -1593,13 +1593,16 @@ +power64le.p.o: power64le-$(SYSTEM).o + cp power64le-$(SYSTEM).o power64le.p.o + ++power64le.pic.o: power64le-$(SYSTEM).pic.o ++ cp power64le-$(SYSTEM).pic.o power64le.pic.o ++ main.c: ../byterun/main.c ln -s ../byterun/main.c main.c misc.c: ../byterun/misc.c -Index: ocaml-4.02.0/asmrun/power64-elf.S +Index: ocaml-4.02.2/asmrun/power64-elf.S =================================================================== ---- ocaml-4.02.0.orig/asmrun/power64-elf.S -+++ ocaml-4.02.0/asmrun/power64-elf.S +--- ocaml-4.02.2.orig/asmrun/power64-elf.S ++++ ocaml-4.02.2/asmrun/power64-elf.S @@ -23,12 +23,16 @@ addis tmp, 0, glob@ha; \ std reg, glob@l(tmp) @@ -1872,10 +1875,10 @@ /* Frame table */ -Index: ocaml-4.02.0/asmrun/power64le-elf.S +Index: ocaml-4.02.2/asmrun/power64le-elf.S =================================================================== --- /dev/null -+++ ocaml-4.02.0/asmrun/power64le-elf.S ++++ ocaml-4.02.2/asmrun/power64le-elf.S @@ -0,0 +1,579 @@ +/*********************************************************************/ +/* */ @@ -2456,10 +2459,10 @@ + .short 0 /* no roots here */ + .align 3 + -Index: ocaml-4.02.0/asmrun/stack.h +Index: ocaml-4.02.2/asmrun/stack.h =================================================================== ---- ocaml-4.02.0.orig/asmrun/stack.h -+++ ocaml-4.02.0/asmrun/stack.h +--- ocaml-4.02.2.orig/asmrun/stack.h ++++ ocaml-4.02.2/asmrun/stack.h @@ -55,6 +55,15 @@ #define Callback_link(sp) ((struct caml_context *)((sp) + Trap_frame_size)) #endif @@ -2476,11 +2479,11 @@ #ifdef TARGET_arm #define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) -Index: ocaml-4.02.0/configure +Index: ocaml-4.02.2/configure =================================================================== ---- ocaml-4.02.0.orig/configure -+++ ocaml-4.02.0/configure -@@ -809,6 +809,7 @@ case "$target" in +--- ocaml-4.02.2.orig/configure ++++ ocaml-4.02.2/configure +@@ -844,6 +844,7 @@ case "$target" in i[3456]86-*-gnu*) arch=i386; system=gnu;; i[3456]86-*-mingw*) arch=i386; system=mingw;; powerpc64-*-linux*) arch=power64; model=ppc64; system=elf;; @@ -2488,7 +2491,7 @@ powerpc*-*-linux*) arch=power; model=ppc; system=elf;; powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; -@@ -891,6 +892,8 @@ case "$arch,$system" in +@@ -926,6 +927,8 @@ case "$arch,$system" in aspp="${TOOLPREF}gcc -c";; power64,elf) as='as -u -m ppc64' aspp='gcc -c';;
