Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2014-10-18 09:08:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-30 16:04:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2014-10-18 09:08:28.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Oct 8 10:14:20 UTC 2014 - oher...@suse.de + +- update version 4.02.0 + * http://caml.inria.fr/pub/distrib/ocaml-4.02/notes/Changes + drop ocaml-rpath.patch, can be done with make args + drop ocaml-yacc-Use-mkstemp-instead-of-mktemp.patch, upstream + drop unused postscript docs +- Removed Camlp4 and Labltk from the distribution, now available as + third-party software. + +------------------------------------------------------------------- Old: ---- ocaml-4.01-refman-html.tar.xz ocaml-4.01-refman.info.tar.xz ocaml-4.01-refman.ps.xz ocaml-4.01.0.tar.xz ocaml-rpath.patch ocaml-yacc-Use-mkstemp-instead-of-mktemp.patch New: ---- ocaml-4.02-refman-html-0.tar.xz ocaml-4.02-refman-html-1.tar.xz ocaml-4.02-refman.info.tar.xz ocaml-4.02.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.rRxrTS/_old 2014-10-18 09:08:29.000000000 +0200 +++ /var/tmp/diff_new_pack.rRxrTS/_new 2014-10-18 09:08:29.000000000 +0200 @@ -18,30 +18,28 @@ # +%define do_camlp4 0 +%define do_labltk 0 Name: ocaml -Version: 4.01.0 +Version: 4.02.0 Release: 0 -%define doc_version 4.01 +%define doc_version 4.02 %define do_opt 0 -%ifarch %arm %ix86 ppc ppc64 ppc64le x86_64 +%ifarch %arm aarch64 %ix86 ppc ppc64 ppc64le x86_64 %define do_opt 1 %endif # http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ -Source0: ocaml-%{version}.tar.xz -Source1: ocaml-%{doc_version}-refman-html.tar.xz -Source2: ocaml-%{doc_version}-refman.ps.xz +Source0: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{version}.tar.xz +Source1: ocaml-%{doc_version}-refman-html-0.tar.xz +Source2: ocaml-%{doc_version}-refman-html-1.tar.xz Source3: ocaml-%{doc_version}-refman.info.tar.xz Source4: rpmlintrc Patch0: ocaml-3.00-camldebug_el.patch Patch2: ocaml-3.04-ocamltags--no-site-start.patch -# FIX-UPSTREAM remove rpath from make file -Patch3: ocaml-rpath.patch # FIX-UPSTREAM pass RPM_OPT_FLAGS to build Patch4: ocaml-configure-Allow-user-defined-C-compiler-flags.patch Patch5: ocaml-3.08.3-gcc4.patch Patch7: ocaml-3.09-emacs_localcompile.patch -# FIX-UPSTREAM use mkstemp to fix rpmlint warning -Patch8: ocaml-yacc-Use-mkstemp-instead-of-mktemp.patch # FIX-UPSTREAM enable build on PowerPC 64bit platform. Patch9: ocaml-ppc64.patch # FIX-UPSTREAM enable build on PowerPC 64bit LE platform. @@ -115,6 +113,7 @@ +%if %{do_labltk} %package labltk Summary: The Objective Caml Compiler and Programming Environment License: SUSE-LGPL-2.0-with-linking-exception @@ -149,6 +148,8 @@ +%endif +%if %{do_camlp4} %package camlp4 Summary: Pre-Processor-Pretty-Printer for Objective Caml License: SUSE-LGPL-2.0-with-linking-exception @@ -180,7 +181,7 @@ source file and printing some result on standard output. This package contains the development files. - +%endif %package ocamldoc Summary: The Objective Caml Compiler and Programming Environment @@ -252,20 +253,16 @@ %prep -%setup -q -T -b 0 -%setup -q -T -D -a 1 -%setup -q -T -D -a 3 +%setup -q -a 1 -a 2 -a 3 %patch0 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 %patch7 -%patch8 -p1 %patch9 -p1 %patch10 -p1 -find -name ".cvsignore" | xargs -r rm -f +find -name ".cvsignore" -print -delete %build %ifarch %ix86 @@ -289,10 +286,13 @@ -x11include %{_includedir} \ -x11lib %{_libdir} %if %{do_opt} -make world.opt +make world.opt \ %else -make world +make world \ %endif + BYTECCRPATH= \ + NATIVECCRPATH= \ + MKSHAREDLIBRPATH= %install make install \ @@ -372,16 +372,28 @@ %exclude %{_libdir}/ocaml/graphicsX11.mli %{_infodir}/* %exclude %{_bindir}/ocamlrun +%if %{do_camlp4} %exclude %{_bindir}/camlp4* %exclude %{_bindir}/mkcamlp4 +%endif +%if %{do_labltk} %exclude %{_bindir}/labltk +%endif %exclude %{_bindir}/ocamltags +%if %{do_labltk} %exclude %{_bindir}/ocamlbrowser +%endif %exclude %{_bindir}/ocamldoc* +%if %{do_camlp4} %exclude %{_libdir}/ocaml/camlp4 +%endif +%if %{do_labltk} %exclude %{_libdir}/ocaml/labltk +%endif %exclude %{_libdir}/ocaml/ocamldoc +%if %{do_labltk} %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so +%endif %files runtime %defattr(-,root,root,-) @@ -398,7 +410,9 @@ %{_libdir}/ocaml/threads/*.cmi %{_libdir}/ocaml/threads/*.cma %exclude %{_libdir}/ocaml/graphicsX11.cmi +%if %{do_labltk} %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so +%endif %doc README LICENSE Changes %files x11 @@ -410,6 +424,7 @@ %defattr(-,root,root,-) %{_libdir}/ocaml/*.ml +%if %{do_labltk} %files labltk %defattr(-,root,root,-) %{_bindir}/labltk @@ -434,7 +449,9 @@ %{_libdir}/ocaml/labltk/*.mli %doc otherlibs/labltk/examples_labltk %doc otherlibs/labltk/examples_camltk +%endif +%if %{do_camlp4} %files camlp4 %defattr(-,root,root,-) %dir %{_libdir}/ocaml/camlp4 @@ -472,6 +489,7 @@ %{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx %{_libdir}/ocaml/camlp4/Camlp4Top/*.o %endif +%endif %files ocamldoc %defattr(-,root,root,-) ++++++ ocaml-4.01-refman.info.tar.xz -> ocaml-4.02-refman.info.tar.xz ++++++ Files old/infoman/ocaml.info.body-1.gz and new/infoman/ocaml.info.body-1.gz differ Files old/infoman/ocaml.info.body-10.gz and new/infoman/ocaml.info.body-10.gz differ Files old/infoman/ocaml.info.body-11.gz and new/infoman/ocaml.info.body-11.gz differ Files old/infoman/ocaml.info.body-12.gz and new/infoman/ocaml.info.body-12.gz differ Files old/infoman/ocaml.info.body-13.gz and new/infoman/ocaml.info.body-13.gz differ Files old/infoman/ocaml.info.body-14.gz and new/infoman/ocaml.info.body-14.gz differ Files old/infoman/ocaml.info.body-15.gz and new/infoman/ocaml.info.body-15.gz differ Files old/infoman/ocaml.info.body-16.gz and new/infoman/ocaml.info.body-16.gz differ Files old/infoman/ocaml.info.body-17.gz and new/infoman/ocaml.info.body-17.gz differ Files old/infoman/ocaml.info.body-18.gz and new/infoman/ocaml.info.body-18.gz differ Files old/infoman/ocaml.info.body-19.gz and new/infoman/ocaml.info.body-19.gz differ Files old/infoman/ocaml.info.body-2.gz and new/infoman/ocaml.info.body-2.gz differ Files old/infoman/ocaml.info.body-20.gz and new/infoman/ocaml.info.body-20.gz differ Files old/infoman/ocaml.info.body-21.gz and new/infoman/ocaml.info.body-21.gz differ Files old/infoman/ocaml.info.body-22.gz and new/infoman/ocaml.info.body-22.gz differ Files old/infoman/ocaml.info.body-23.gz and new/infoman/ocaml.info.body-23.gz differ Files old/infoman/ocaml.info.body-24.gz and new/infoman/ocaml.info.body-24.gz differ Files old/infoman/ocaml.info.body-3.gz and new/infoman/ocaml.info.body-3.gz differ Files old/infoman/ocaml.info.body-4.gz and new/infoman/ocaml.info.body-4.gz differ Files old/infoman/ocaml.info.body-5.gz and new/infoman/ocaml.info.body-5.gz differ Files old/infoman/ocaml.info.body-6.gz and new/infoman/ocaml.info.body-6.gz differ Files old/infoman/ocaml.info.body-7.gz and new/infoman/ocaml.info.body-7.gz differ Files old/infoman/ocaml.info.body-8.gz and new/infoman/ocaml.info.body-8.gz differ Files old/infoman/ocaml.info.body-9.gz and new/infoman/ocaml.info.body-9.gz differ Files old/infoman/ocaml.info.body.gz and new/infoman/ocaml.info.body.gz differ Files old/infoman/ocaml.info.gz and new/infoman/ocaml.info.gz differ Files old/infoman/ocaml.info.haux.gz and new/infoman/ocaml.info.haux.gz differ Files old/infoman/ocaml.info.hocaml.info.hind.gz and new/infoman/ocaml.info.hocaml.info.hind.gz differ Files old/infoman/ocaml.info.hocaml.info.kwd.hind.gz and new/infoman/ocaml.info.hocaml.info.kwd.hind.gz differ ++++++ ocaml-4.01-refman.info.tar.xz -> ocaml-4.02.0.tar.xz ++++++ ++++ 396758 lines of diff (skipped) ++++++ ocaml-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.rRxrTS/_old 2014-10-18 09:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.rRxrTS/_new 2014-10-18 09:08:30.000000000 +0200 @@ -38,10 +38,10 @@ create mode 100644 asmcomp/power64/selection.ml create mode 100644 asmrun/power64-elf.S -Index: ocaml-4.01.0/asmcomp/power64/arch.ml +Index: ocaml-4.02.0/asmcomp/power64/arch.ml =================================================================== --- /dev/null -+++ ocaml-4.01.0/asmcomp/power64/arch.ml ++++ ocaml-4.02.0/asmcomp/power64/arch.ml @@ -0,0 +1,88 @@ +(***********************************************************************) +(* *) @@ -131,10 +131,10 @@ + printreg arg.(0) printreg arg.(1) printreg arg.(2) + | Ialloc_far n -> + fprintf ppf "alloc_far %d" n -Index: ocaml-4.01.0/asmcomp/power64/emit.mlp +Index: ocaml-4.02.0/asmcomp/power64/emit.mlp =================================================================== --- /dev/null -+++ ocaml-4.01.0/asmcomp/power64/emit.mlp ++++ ocaml-4.02.0/asmcomp/power64/emit.mlp @@ -0,0 +1,988 @@ +(***********************************************************************) +(* *) @@ -170,12 +170,12 @@ +let stack_args_size = ref 0 +let stack_traps_size = ref 0 + -+(* We have a stack frame of our own if we call other functions (including ++(* We have a stack frame of our own if we call other functions (including + use of exceptions, or if we need more than the red zone *) +let has_stack_frame () = + if !contains_calls || (num_stack_slots.(0) + num_stack_slots.(1)) > (288-16)/8 then + true -+ else ++ else + false + +let frame_size_sans_args () = @@ -243,7 +243,7 @@ + Reg r -> emit_string (register_name r) + | _ -> fatal_error "Emit.emit_reg" + -+let use_full_regnames = ++let use_full_regnames = + Config.system = "rhapsody" + +let emit_gpr r = @@ -300,7 +300,7 @@ + if d > 0 then `+`; + if d <> 0 then emit_int d + -+let emit_tocentry entry = ++let emit_tocentry entry = + match entry with + TocSymOfs(s,d) -> emit_symbol_offset(s,d) + | TocInt i -> emit_nativeint i @@ -318,7 +318,7 @@ + else + tocref_label (lst, content) + -+let emit_tocref entry = ++let emit_tocref entry = + let lbl = tocref_label (!tocref_entries,entry) in + emit_label lbl; emit_string "@toc(2) #"; emit_tocentry entry + @@ -498,7 +498,7 @@ + | Lop(Icall_ind) -> 6 + | Lop(Icall_imm s) -> 7 + | Lop(Itailcall_ind) -> if !contains_calls then 7 else if has_stack_frame() then 5 else 4 -+ | Lop(Itailcall_imm s) -> if s = !function_name then 1 else ++ | Lop(Itailcall_imm s) -> if s = !function_name then 1 else + if !contains_calls then 8 else + if has_stack_frame() then 6 else 5 + | Lop(Iextcall(s, true)) -> 8 @@ -658,7 +658,7 @@ + ` ld {emit_gpr 2}, 8({emit_gpr 11})\n`; + ` ld {emit_gpr 11}, 0({emit_gpr 11})\n`; + ` mtctr {emit_gpr 11}\n`; -+ record_frame i.live; ++ record_frame i.live; + ` bctrl\n`; + ` ld {emit_gpr 2},40({emit_gpr 1})\n` + | Lop(Itailcall_ind) -> @@ -770,13 +770,13 @@ + | Lop(Iintop_imm(Idiv, n)) -> (* n is guaranteed to be a power of 2 *) + let l = Misc.log2 n in + ` sradi {emit_reg i.res.(0)}, {emit_reg i.arg.(0)}, {emit_int l}\n`; -+ ` addze {emit_reg i.res.(0)}, {emit_reg i.res.(0)}\n` ++ ` addze {emit_reg i.res.(0)}, {emit_reg i.res.(0)}\n` + | Lop(Iintop_imm(Imod, n)) -> (* n is guaranteed to be a power of 2 *) + let l = Misc.log2 n in + ` sradi {emit_gpr 0}, {emit_reg i.arg.(0)}, {emit_int l}\n`; + ` addze {emit_gpr 0}, {emit_gpr 0}\n`; + ` sldi {emit_gpr 0}, {emit_gpr 0}, {emit_int l}\n`; -+ ` subfc {emit_reg i.res.(0)}, {emit_gpr 0}, {emit_reg i.arg.(0)}\n` ++ ` subfc {emit_reg i.res.(0)}, {emit_gpr 0}, {emit_reg i.arg.(0)}\n` + | Lop(Iintop_imm(Icomp cmp, n)) -> + begin match cmp with + Isigned c -> @@ -816,7 +816,7 @@ + ` mtlr {emit_gpr 11}\n` + end + | Lreturn -> -+ if has_stack_frame() then ++ if has_stack_frame() then + ` ld {emit_gpr 1}, 0({emit_gpr 1})\n`; + ` blr\n` + | Llabel lbl -> @@ -1008,7 +1008,7 @@ + ` .set {emit_label !stack_slot_lbl},{emit_int (48 + !stack_args_size)} # stack slot offset\n` + end else (* leave 8 bytes for float <-> conversions *) + ` .set {emit_label !stack_slot_lbl},{emit_int (40-frame_size_sans_args())} # stack slot offset (negative)\n`; -+ ++ + (* Emit the glue code to call the GC *) + if !call_gc_label > 0 then begin + `{emit_label !call_gc_label}:\n`; @@ -1096,7 +1096,7 @@ + match entry with + TocFloat f -> + ` .double {emit_tocentry entry}\n` -+ | _ -> ++ | _ -> + ` .tc {emit_label lbl}[TC],{emit_tocentry entry}\n` + ) + !tocref_entries; @@ -1124,10 +1124,10 @@ + ` .quad {emit_int (List.length !frame_descriptors)}\n`; + List.iter emit_frame !frame_descriptors; + frame_descriptors := [] -Index: ocaml-4.01.0/asmcomp/power64/proc.ml +Index: ocaml-4.02.0/asmcomp/power64/proc.ml =================================================================== --- /dev/null -+++ ocaml-4.01.0/asmcomp/power64/proc.ml ++++ ocaml-4.02.0/asmcomp/power64/proc.ml @@ -0,0 +1,240 @@ +(***********************************************************************) +(* *) @@ -1176,14 +1176,14 @@ + +let int_reg_name = + if Config.system = "rhapsody" then -+ [| "r3"; "r4"; "r5"; "r6"; "r7"; "r8"; "r9"; "r10"; ++ [| "r3"; "r4"; "r5"; "r6"; "r7"; "r8"; "r9"; "r10"; + "r14"; "r15"; "r16"; "r17"; "r18"; "r19"; "r20"; "r21"; + "r22"; "r23"; "r24"; "r25"; "r26"; "r27"; "r28" |] + else -+ [| "3"; "4"; "5"; "6"; "7"; "8"; "9"; "10"; ++ [| "3"; "4"; "5"; "6"; "7"; "8"; "9"; "10"; + "14"; "15"; "16"; "17"; "18"; "19"; "20"; "21"; + "22"; "23"; "24"; "25"; "26"; "27"; "28" |] -+ ++ +let float_reg_name = + if Config.system = "rhapsody" then + [| "f1"; "f2"; "f3"; "f4"; "f5"; "f6"; "f7"; "f8"; @@ -1369,10 +1369,10 @@ + Filename.quote outfile ^ " " ^ Filename.quote infile) + +let init () = () -Index: ocaml-4.01.0/asmcomp/power64/reload.ml +Index: ocaml-4.02.0/asmcomp/power64/reload.ml =================================================================== --- /dev/null -+++ ocaml-4.01.0/asmcomp/power64/reload.ml ++++ ocaml-4.02.0/asmcomp/power64/reload.ml @@ -0,0 +1,18 @@ +(***********************************************************************) +(* *) @@ -1392,10 +1392,10 @@ + +let fundecl f = + (new Reloadgen.reload_generic)#fundecl f -Index: ocaml-4.01.0/asmcomp/power64/scheduling.ml +Index: ocaml-4.02.0/asmcomp/power64/scheduling.ml =================================================================== --- /dev/null -+++ ocaml-4.01.0/asmcomp/power64/scheduling.ml ++++ ocaml-4.02.0/asmcomp/power64/scheduling.ml @@ -0,0 +1,65 @@ +(***********************************************************************) +(* *) @@ -1462,10 +1462,10 @@ +end + +let fundecl f = (new scheduler)#schedule_fundecl f -Index: ocaml-4.01.0/asmcomp/power64/selection.ml +Index: ocaml-4.02.0/asmcomp/power64/selection.ml =================================================================== --- /dev/null -+++ ocaml-4.01.0/asmcomp/power64/selection.ml ++++ ocaml-4.02.0/asmcomp/power64/selection.ml @@ -0,0 +1,101 @@ +(***********************************************************************) +(* *) @@ -1536,7 +1536,7 @@ + a power of 2, which do not correspond to an instruction. *) + (Cdivi, [arg; Cconst_int n]) when n = 1 lsl (Misc.log2 n) -> + (Iintop_imm(Idiv, n), [arg]) -+ | (Cdivi, _) -> ++ | (Cdivi, _) -> + (Iintop Idiv, args) + | (Cmodi, [arg; Cconst_int n]) when n = 1 lsl (Misc.log2 n) -> + (Iintop_imm(Imod, n), [arg]) @@ -1568,11 +1568,11 @@ +end + +let fundecl f = (new selector)#emit_fundecl f -Index: ocaml-4.01.0/asmrun/Makefile +Index: ocaml-4.02.0/asmrun/Makefile =================================================================== ---- ocaml-4.01.0.orig/asmrun/Makefile -+++ ocaml-4.01.0/asmrun/Makefile -@@ -90,6 +90,12 @@ power.o: power-$(SYSTEM).o +--- 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 @@ -1585,10 +1585,10 @@ main.c: ../byterun/main.c ln -s ../byterun/main.c main.c misc.c: ../byterun/misc.c -Index: ocaml-4.01.0/asmrun/power64-elf.S +Index: ocaml-4.02.0/asmrun/power64-elf.S =================================================================== --- /dev/null -+++ ocaml-4.01.0/asmrun/power64-elf.S ++++ ocaml-4.02.0/asmrun/power64-elf.S @@ -0,0 +1,486 @@ +/*********************************************************************/ +/* */ @@ -1622,7 +1622,7 @@ + .globl caml_call_gc + .type caml_call_gc, @function + .section ".opd","aw" -+ .align 3 ++ .align 3 +caml_call_gc: + .quad .L.caml_call_gc,.TOC.@tocbase + .previous @@ -1781,13 +1781,13 @@ + /* Return */ + blr + .size .L.caml_call_gc,.-.L.caml_call_gc -+ ++ +/* Call a C function from Caml */ + + .globl caml_c_call + .type caml_c_call, @function + .section ".opd","aw" -+ .align 3 ++ .align 3 +caml_c_call: + .quad .L.caml_c_call,.TOC.@tocbase + .previous @@ -1821,13 +1821,13 @@ + blr + .cfi_endproc + .size .L.caml_c_call,.-.L.caml_c_call -+ ++ +/* Raise an exception from C */ + + .globl caml_raise_exception + .type caml_raise_exception, @function + .section ".opd","aw" -+ .align 3 ++ .align 3 +caml_raise_exception: + .quad .L.caml_raise_exception,.TOC.@tocbase + .previous @@ -1849,13 +1849,13 @@ + /* Branch to handler */ + blr + .size .L.caml_raise_exception,.-.L.caml_raise_exception -+ ++ +/* Start the Caml program */ + + .globl caml_start_program + .type caml_start_program, @function + .section ".opd","aw" -+ .align 3 ++ .align 3 +caml_start_program: + .quad .L.caml_start_program,.TOC.@tocbase + .previous @@ -1928,7 +1928,7 @@ + Loadglobal(11, caml_exception_pointer, 11) + std 11, 0(29) + /* Reload allocation pointers */ -+ Loadglobal(31, caml_young_ptr, 11) ++ Loadglobal(31, caml_young_ptr, 11) + Loadglobal(30, caml_young_limit, 11) + /* Say we are back into Caml code */ + li 0, 0 @@ -1949,9 +1949,9 @@ + ld 9, 0x150(1) + ld 10, 0x158(1) + ld 11, 0x160(1) -+ Storeglobal(9, caml_bottom_of_stack, 12) -+ Storeglobal(10, caml_last_return_address, 12) -+ Storeglobal(11, caml_gc_regs, 12) ++ Storeglobal(9, caml_bottom_of_stack, 12) ++ Storeglobal(10, caml_last_return_address, 12) ++ Storeglobal(11, caml_gc_regs, 12) + /* Update allocation pointer */ + Storeglobal(31, caml_young_ptr, 11) + /* Restore callee-save registers */ @@ -2007,13 +2007,13 @@ + ori 3, 3, 2 + b .L106 + .size .L.caml_start_program,.-.L.caml_start_program -+ ++ +/* Callback from C to Caml */ + + .globl caml_callback_exn + .type caml_callback_exn, @function + .section ".opd","aw" -+ .align 3 ++ .align 3 +caml_callback_exn: + .quad .L.caml_callback_exn,.TOC.@tocbase + .previous @@ -2027,11 +2027,11 @@ + b .L102 + .size .L.caml_callback_exn,.-.L.caml_callback_exn + -+ ++ + .globl caml_callback2_exn + .type caml_callback2_exn, @function + .section ".opd","aw" -+ .align 3 ++ .align 3 +caml_callback2_exn: + .quad .L.caml_callback2_exn,.TOC.@tocbase + .previous @@ -2045,11 +2045,11 @@ + b .L102 + .size .L.caml_callback2_exn,.-.L.caml_callback2_exn + -+ ++ + .globl caml_callback3_exn + .type caml_callback3_exn, @function + .section ".opd","aw" -+ .align 3 ++ .align 3 +caml_callback3_exn: + .quad .L.caml_callback3_exn,.TOC.@tocbase + .previous @@ -2063,7 +2063,7 @@ + Addrglobal(12, caml_apply3) + b .L102 + .size .L.caml_callback3_exn,.-.L.caml_callback3_exn -+ ++ +/* Frame table */ + + .section ".data" @@ -2076,10 +2076,10 @@ + .short 0 /* no roots here */ + .align 3 + -Index: ocaml-4.01.0/asmrun/stack.h +Index: ocaml-4.02.0/asmrun/stack.h =================================================================== ---- ocaml-4.01.0.orig/asmrun/stack.h -+++ ocaml-4.01.0/asmrun/stack.h +--- ocaml-4.02.0.orig/asmrun/stack.h ++++ ocaml-4.02.0/asmrun/stack.h @@ -46,6 +46,15 @@ #define Callback_link(sp) ((struct caml_context *)((sp) + Trap_frame_size)) #endif @@ -2096,24 +2096,24 @@ #ifdef TARGET_arm #define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) -Index: ocaml-4.01.0/configure +Index: ocaml-4.02.0/configure =================================================================== ---- ocaml-4.01.0.orig/configure -+++ ocaml-4.01.0/configure -@@ -694,6 +694,7 @@ case "$host" in - arch=i386; system=macosx +--- ocaml-4.02.0.orig/configure ++++ ocaml-4.02.0/configure +@@ -808,6 +808,7 @@ case "$target" in fi;; i[3456]86-*-gnu*) arch=i386; system=gnu;; + i[3456]86-*-mingw*) arch=i386; system=mingw;; + 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-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; -@@ -776,6 +777,8 @@ case "$arch,$model,$system" in - aspp='gcc -c';; - power,*,bsd*) as='as' - aspp='gcc -c';; -+ power64,*,elf) as='as -u -m ppc64' -+ aspp='gcc -c';; - power,*,rhapsody) as="as -arch $model" - aspp="$bytecc -c";; - sparc,*,solaris) as='as' +@@ -888,6 +889,8 @@ case "$arch,$system" in + aspp="/usr/ccs/bin/${TOOLPREF}as -P";; + power,elf) as="${TOOLPREF}as -u -m ppc" + aspp="${TOOLPREF}gcc -c";; ++ power64,elf) as='as -u -m ppc64' ++ aspp='gcc -c';; + power,rhapsody) as="${TOOLPREF}as -arch $model" + aspp="$bytecc -c";; + sparc,solaris) as="${TOOLPREF}as" ++++++ ocaml-ppc64le.patch ++++++ ++++ 918 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ocaml/ocaml-ppc64le.patch ++++ and /work/SRC/openSUSE:Factory/.ocaml.new/ocaml-ppc64le.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
