This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml.
commit dca89912c6aa6e87dddaa0fcf0e5417b8879fa53 Author: Stephane Glondu <st...@glondu.net> Date: Thu Oct 17 11:43:54 2013 +0200 Refresh patches --- .../0001-Pass-no-relax-to-ld-on-alpha.patch | 8 ++--- .../patches/0002-Call-ld-with-proper-flags.patch | 6 ++-- debian/patches/0003-Don-t-use-rpath.patch | 6 ++-- ...4-Put-manpages-in-section-3o-instead-of-3.patch | 6 ++-- .../0005-Patch-config.sh-for-installation.patch | 12 ++++---- ...mlbuild-as-a-link-on-either-.native-or-.b.patch | 8 ++--- ...ple-declarations-in-generated-.c-files-in.patch | 22 +++++++------- ...ed-bytecode-in-C-object-when-using-custom.patch | 32 +++++++++++--------- .../0009-Fix-code-generation-bug-with-mod-1.patch | 25 --------------- debian/patches/series | 1 - 10 files changed, 51 insertions(+), 75 deletions(-) diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch index f9ef8a2..b8b0e0b 100644 --- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch +++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch @@ -5,14 +5,14 @@ Subject: Pass --no-relax to ld on alpha Pass the --no-relax option to ld to fix a segfault in initialization code (bug#338437) --- - configure | 4 +++- + configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index e08bbce..c95424e 100755 +index 07b1c35..0b0554f 100755 --- a/configure +++ b/configure -@@ -299,7 +299,8 @@ case "$bytecc,$host" in +@@ -304,7 +304,8 @@ case "$bytecc,$host" in gcc,alpha*-*-linux*) if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; @@ -22,7 +22,7 @@ index e08bbce..c95424e 100755 cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" -@@ -734,6 +735,7 @@ case "$arch,$nativecc,$system,$host_type" in +@@ -746,6 +747,7 @@ case "$arch,$nativecc,$system,$host_type" in nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" if $arch64; then partialld="ld -r -arch ppc64"; fi;; diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch index 90cae41..903f218 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -6,14 +6,14 @@ Filter linkflags passed to ld by ocamlopt -pack and -output-obj to remove the "-Wl," parts, which are only used when ocamlopt calls gcc. --- - configure | 2 +- + configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index c95424e..20f7977 100755 +index 0b0554f..1294fad 100755 --- a/configure +++ b/configure -@@ -1619,7 +1619,7 @@ echo "DEBUGGER=$debugger" >> Makefile +@@ -1655,7 +1655,7 @@ echo "DEBUGGER=$debugger" >> Makefile echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index 02855e5..0061437 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -3,14 +3,14 @@ Date: Tue, 19 May 2009 17:24:14 +0200 Subject: Don't use rpath --- - tools/ocamlmklib.mlp | 5 +++++ + tools/ocamlmklib.mlp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp -index b6c236e..b491fdd 100644 +index 9a47d1b..729145f 100644 --- a/tools/ocamlmklib.mlp +++ b/tools/ocamlmklib.mlp -@@ -38,6 +38,11 @@ and output_c = ref "" (* Output name for C part of library *) +@@ -37,6 +37,11 @@ and output_c = ref "" (* Output name for C part of library *) and rpath = ref [] (* rpath options *) and verbose = ref false diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch index 17ede18..35832b5 100644 --- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch +++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch @@ -3,14 +3,14 @@ Date: Tue, 19 May 2009 17:24:52 +0200 Subject: Put manpages in section 3o instead of 3 --- - ocamldoc/Makefile | 2 +- + ocamldoc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index 74c82d3..1ef43b3 100644 +index 144b95d..4d4f3f2 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile -@@ -344,7 +344,7 @@ test_texi: dummy +@@ -345,7 +345,7 @@ test_texi: dummy stdlib_man/Pervasives.3o: $(STDLIB_MLIS) $(MKDIR) stdlib_man $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \ diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch index 246da81..15c6625 100644 --- a/debian/patches/0005-Patch-config.sh-for-installation.patch +++ b/debian/patches/0005-Patch-config.sh-for-installation.patch @@ -4,15 +4,15 @@ Subject: Patch config.sh for installation Use for installatation a patched config.sh (created by debian/rules). --- - build/install.sh | 2 +- - build/partial-install.sh | 2 +- + build/install.sh | 2 +- + build/partial-install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/install.sh b/build/install.sh -index df01db4..546d65a 100755 +index d092d66..d80a158 100755 --- a/build/install.sh +++ b/build/install.sh -@@ -18,7 +18,7 @@ set -e +@@ -16,7 +16,7 @@ set -e cd `dirname $0`/.. @@ -22,10 +22,10 @@ index df01db4..546d65a 100755 not_installed=$PWD/_build/not_installed diff --git a/build/partial-install.sh b/build/partial-install.sh -index a8113c9..15071d4 100755 +index c06154a..42c3558 100755 --- a/build/partial-install.sh +++ b/build/partial-install.sh -@@ -22,7 +22,7 @@ set -e +@@ -20,7 +20,7 @@ set -e cd `dirname $0`/.. diff --git a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch index 0641f82..0917c72 100644 --- a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch +++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch @@ -3,14 +3,14 @@ Date: Tue, 19 May 2009 17:28:56 +0200 Subject: Install ocamlbuild as a link on either .native or .byte --- - build/partial-install.sh | 17 ++++++++++++++++- + build/partial-install.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/partial-install.sh b/build/partial-install.sh -index 15071d4..8170706 100755 +index 42c3558..96d21de 100755 --- a/build/partial-install.sh +++ b/build/partial-install.sh -@@ -60,6 +60,21 @@ installbestbin() { +@@ -58,6 +58,21 @@ installbestbin() { [ -x "$3" ] || chmod +x "$3" } @@ -32,7 +32,7 @@ index 15071d4..8170706 100755 installlib() { if [ -f "$1" ]; then dest="$2/`basename $1`" -@@ -158,7 +173,7 @@ echo "Installing ocamlbuild..." +@@ -156,7 +171,7 @@ echo "Installing ocamlbuild..." cd ocamlbuild installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE diff --git a/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch index 8d857f4..62a2f7e 100644 --- a/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch +++ b/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch @@ -13,16 +13,16 @@ mlvalues.h), but this is a small and (not too) intrusive patch. Bug: http://caml.inria.fr/mantis/view.php?id=5254 Signed-off-by: Stephane Glondu <st...@glondu.net> --- - bytecomp/bytelink.ml | 17 +++++++++++++++-- - bytecomp/symtable.ml | 8 +++++--- - bytecomp/symtable.mli | 2 +- + bytecomp/bytelink.ml | 17 +++++++++++++++-- + bytecomp/symtable.ml | 8 +++++--- + bytecomp/symtable.mli | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml -index f40e425..bb14de6 100644 +index 2098366..87a58ab 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml -@@ -408,6 +408,19 @@ let output_cds_file outfile = +@@ -421,6 +421,19 @@ let output_cds_file outfile = remove_file outfile; raise x @@ -42,7 +42,7 @@ index f40e425..bb14de6 100644 (* Output a bytecode executable as a C file *) let link_bytecode_as_c ppf tolink outfile = -@@ -450,7 +463,7 @@ let link_bytecode_as_c ppf tolink outfile = +@@ -463,7 +476,7 @@ let link_bytecode_as_c ppf tolink outfile = (Marshal.to_string sections []); output_string outchan "\n};\n\n"; (* The table of primitives *) @@ -51,7 +51,7 @@ index f40e425..bb14de6 100644 (* The entry point *) output_string outchan "\ \nvoid caml_startup(char ** argv)\ -@@ -530,7 +543,7 @@ let link ppf objfiles output_name = +@@ -544,7 +557,7 @@ let link ppf objfiles output_name = #else\n\ typedef long value;\n\ #endif\n"; @@ -61,10 +61,10 @@ index f40e425..bb14de6 100644 #ifdef __cplusplus\n\ }\n\ diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml -index 7ab4bfd..3f4495e 100644 +index 63374f8..cf72528 100644 --- a/bytecomp/symtable.ml +++ b/bytecomp/symtable.ml -@@ -115,15 +115,17 @@ let output_primitive_names outchan = +@@ -113,15 +113,17 @@ let output_primitive_names outchan = open Printf @@ -86,10 +86,10 @@ index 7ab4bfd..3f4495e 100644 fprintf outchan " (primitive) 0 };\n"; fprintf outchan "const char * caml_names_of_builtin_cprim[] = {\n"; diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli -index b4268f4..22dfebc 100644 +index e3c33d2..597d012 100644 --- a/bytecomp/symtable.mli +++ b/bytecomp/symtable.mli -@@ -24,7 +24,7 @@ val require_primitive: string -> unit +@@ -23,7 +23,7 @@ val require_primitive: string -> unit val initial_global_table: unit -> Obj.t array val output_global_map: out_channel -> unit val output_primitive_names: out_channel -> unit diff --git a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch index f19165a..d8366b6 100644 --- a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch +++ b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch @@ -12,16 +12,16 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577 Signed-off-by: Stephane Glondu <st...@glondu.net> --- - bytecomp/bytelink.ml | 42 ++++++++++++++++++++++++++++++---- - testsuite/tests/embedded/Makefile | 3 +++ - testsuite/tests/lib-marshal/Makefile | 3 +++ - 3 files changed, 44 insertions(+), 4 deletions(-) + bytecomp/bytelink.ml | 42 ++++++++++++++++++++++++++++++++---- + testsuite/tests/embedded/Makefile | 4 ++++ + testsuite/tests/lib-marshal/Makefile | 3 +++ + 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml -index bb14de6..9922bf2 100644 +index 87a58ab..72678fa 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml -@@ -423,7 +423,7 @@ let mlvalues_primitives = [ +@@ -436,7 +436,7 @@ let mlvalues_primitives = [ (* Output a bytecode executable as a C file *) @@ -30,7 +30,7 @@ index bb14de6..9922bf2 100644 let outchan = open_out outfile in begin try (* The bytecode *) -@@ -465,14 +465,27 @@ let link_bytecode_as_c ppf tolink outfile = +@@ -478,14 +478,27 @@ let link_bytecode_as_c ppf tolink outfile = (* The table of primitives *) Symtable.output_primitive_table outchan mlvalues_primitives; (* The entry point *) @@ -60,7 +60,7 @@ index bb14de6..9922bf2 100644 \n#ifdef __cplusplus\ \n}\ \n#endif\n"; -@@ -511,6 +524,17 @@ let fix_exec_name name = +@@ -524,6 +537,17 @@ let fix_exec_name name = if String.contains name '.' then name else name ^ ".exe" | _ -> name @@ -78,7 +78,7 @@ index bb14de6..9922bf2 100644 (* Main entry point (build a custom runtime if needed) *) let link ppf objfiles output_name = -@@ -524,6 +548,16 @@ let link ppf objfiles output_name = +@@ -538,6 +562,16 @@ let link ppf objfiles output_name = Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *) if not !Clflags.custom_runtime then link_bytecode ppf tolink output_name true @@ -95,7 +95,7 @@ index bb14de6..9922bf2 100644 else if not !Clflags.output_c_object then begin let bytecode_name = Filename.temp_file "camlcode" "" in let prim_name = Filename.temp_file "camlprim" ".c" in -@@ -566,7 +600,7 @@ let link ppf objfiles output_name = +@@ -580,7 +614,7 @@ let link ppf objfiles output_name = if Sys.file_exists c_file then raise(Error(File_exists c_file)); let temps = ref [] in try @@ -105,23 +105,25 @@ index bb14de6..9922bf2 100644 temps := c_file :: !temps; if Ccomp.compile_file c_file <> 0 then raise(Error Custom_runtime); diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile -index ec2308d..1a826aa 100644 +index 2a01c20..dfd999c 100644 --- a/testsuite/tests/embedded/Makefile +++ b/testsuite/tests/embedded/Makefile -@@ -1,5 +1,8 @@ +@@ -13,6 +13,10 @@ BASEDIR=../.. + .PHONY: default ++ +# This test relies on the upstream behaviour of -custom +export OCAML_CUSTOM_EMBED=n + default: compile run - compile: + .PHONY: compile diff --git a/testsuite/tests/lib-marshal/Makefile b/testsuite/tests/lib-marshal/Makefile -index 1f78273..c246469 100644 +index 34b67dc..e8928e6 100644 --- a/testsuite/tests/lib-marshal/Makefile +++ b/testsuite/tests/lib-marshal/Makefile -@@ -3,5 +3,8 @@ BASEDIR=../.. +@@ -15,5 +15,8 @@ BASEDIR=../.. MAIN_MODULE=intext C_FILES=intextaux diff --git a/debian/patches/0009-Fix-code-generation-bug-with-mod-1.patch b/debian/patches/0009-Fix-code-generation-bug-with-mod-1.patch deleted file mode 100644 index 171f87a..0000000 --- a/debian/patches/0009-Fix-code-generation-bug-with-mod-1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Stephane Glondu <st...@glondu.net> -Date: Fri, 26 Jul 2013 06:13:27 +0200 -Subject: Fix code generation bug with "mod 1" - -Backport of a patch from Benedikt Meurer. ocamlnet needs it. - -Bug: http://caml.inria.fr/mantis/view.php?id=5910 ---- - asmcomp/arm/selection.ml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/asmcomp/arm/selection.ml b/asmcomp/arm/selection.ml -index ecda382..ef112ed 100644 ---- a/asmcomp/arm/selection.ml -+++ b/asmcomp/arm/selection.ml -@@ -173,7 +173,7 @@ method! select_operation op args = - | (Cdivi, args) -> - (Iextcall("__aeabi_idiv", false), args) - | (Cmodi, [arg; Cconst_int n]) -- when n = 1 lsl Misc.log2 n -> -+ when n > 1 && n = 1 lsl Misc.log2 n -> - (Iintop_imm(Imod, n), [arg]) - | (Cmodi, args) -> - (* See above for fix up of return register *) --- diff --git a/debian/patches/series b/debian/patches/series index 52ca655..be80a2c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch 0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0008-Embed-bytecode-in-C-object-when-using-custom.patch -0009-Fix-code-generation-bug-with-mod-1.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits