From: Stephane Glondu Date: Sat, 15 May 2010 22:12:34 +0000 (+0200) Subject: New upstream SVN snapshot X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~343 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7d834c432ff8fe9676f2aa33f2214476ea2aa04f;p=ocaml.git New upstream SVN snapshot --- diff --git a/debian/changelog b/debian/changelog index c0212eda..3e971ee4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ocaml (3.12.0~0dev17+10268-1) UNRELEASED; urgency=low +ocaml (3.12.0~0dev23+10396-1) UNRELEASED; urgency=low [ Stéphane Glondu ] * New upstream SVN snapshot (Closes: #255245, #570920) @@ -11,7 +11,7 @@ ocaml (3.12.0~0dev17+10268-1) UNRELEASED; urgency=low * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el and inf-caml.el for xemacs21 (Closes: #508813, LP: #464587). - -- Stéphane Glondu Sun, 18 Apr 2010 16:26:54 +0200 + -- Stéphane Glondu Sun, 16 May 2010 00:12:15 +0200 ocaml (3.11.2-1) unstable; urgency=low 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 cd019d71..670639d6 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 @@ -9,7 +9,7 @@ code (bug#338437) 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure b/configure -index 40a89e8..bdfdfdd 100755 +index f21bca4..0c9f3c6 100755 --- a/configure +++ b/configure @@ -284,7 +284,8 @@ case "$bytecc,$host" in @@ -22,7 +22,7 @@ index 40a89e8..bdfdfdd 100755 cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" -@@ -697,6 +698,7 @@ case "$arch,$nativecc,$system,$host_type" in +@@ -706,6 +707,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 b99295af..9a4066e8 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -10,10 +10,10 @@ gcc. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure b/configure -index bdfdfdd..020efed 100755 +index 0c9f3c6..d4bef29 100755 --- a/configure +++ b/configure -@@ -1586,7 +1586,7 @@ echo "DEBUGGER=$debugger" >> Makefile +@@ -1595,7 +1595,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/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch index fbef3aae..58deb6f4 100644 --- a/debian/patches/0005-Patch-config.sh-for-installation.patch +++ b/debian/patches/0005-Patch-config.sh-for-installation.patch @@ -9,7 +9,7 @@ Use for installatation a patched config.sh (created by debian/rules). 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/install.sh b/build/install.sh -index 2197069..901964b 100755 +index 1a60a87..5a14765 100755 --- a/build/install.sh +++ b/build/install.sh @@ -18,7 +18,7 @@ set -e diff --git a/debian/patches/0007-Set-version-number.patch b/debian/patches/0007-Set-version-number.patch index deca5293..442b723e 100644 --- a/debian/patches/0007-Set-version-number.patch +++ b/debian/patches/0007-Set-version-number.patch @@ -7,12 +7,12 @@ Subject: [PATCH] Set version number 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION -index 9d186bd..1e53d7b 100644 +index 58fc0bd..af2edec 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ --3.12.0+dev17 (2010-01-20) -+3.12.0+dev17+10268 +-3.12.0+dev23 (2010-05-12) ++3.12.0+dev23+10396 # The version string is the first line of this file. # It must be in the format described in stdlib/sys.mli diff --git a/debian/patches/0008-Mark-overridden-methods-in-asmcomp-selection.ml-fix-.patch b/debian/patches/0008-Mark-overridden-methods-in-asmcomp-selection.ml-fix-.patch deleted file mode 100644 index 1459fc5f..00000000 --- a/debian/patches/0008-Mark-overridden-methods-in-asmcomp-selection.ml-fix-.patch +++ /dev/null @@ -1,128 +0,0 @@ -From: Stephane Glondu -Date: Sun, 18 Apr 2010 18:30:04 +0200 -Subject: [PATCH] Mark overridden methods in asmcomp/*/selection.ml (fix FTBFS) - ---- - asmcomp/alpha/selection.ml | 2 +- - asmcomp/arm/selection.ml | 8 ++++---- - asmcomp/hppa/selection.ml | 4 ++-- - asmcomp/ia64/selection.ml | 2 +- - asmcomp/power/selection.ml | 2 +- - asmcomp/sparc/selection.ml | 2 +- - 6 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/asmcomp/alpha/selection.ml b/asmcomp/alpha/selection.ml -index 6bea0f1..d91ec5b 100644 ---- a/asmcomp/alpha/selection.ml -+++ b/asmcomp/alpha/selection.ml -@@ -40,7 +40,7 @@ method select_addressing = function - | arg -> - (Iindexed 0, arg) - --method select_operation op args = -+method! select_operation op args = - match (op, args) with - (* Recognize shift-add operations *) - ((Caddi|Cadda), -diff --git a/asmcomp/arm/selection.ml b/asmcomp/arm/selection.ml -index ded233e..cdcb73f 100644 ---- a/asmcomp/arm/selection.ml -+++ b/asmcomp/arm/selection.ml -@@ -55,7 +55,7 @@ class selector = object(self) - - inherit Selectgen.selector_generic as super - --method regs_for tyv = -+method !regs_for tyv = - (* Expand floats into pairs of integer registers *) - let nty = Array.length tyv in - let rec expand i = -@@ -94,7 +94,7 @@ method select_shift_arith op shiftop shiftrevop args = - | _ -> - super#select_operation op args - --method select_operation op args = -+method! select_operation op args = - match op with - Cadda | Caddi -> - begin match args with -@@ -163,7 +163,7 @@ method select_operation op args = - (* Other operations are regular *) - | _ -> super#select_operation op args - --method select_condition = function -+method! select_condition = function - | Cop(Ccmpf cmp, args) -> - (Iinttest_imm(Isigned cmp, 0), - Cop(Cextcall(float_comparison_function cmp, -@@ -182,7 +182,7 @@ method select_condition = function - this simplifies code generation later. - *) - --method insert_op_debug op dbg rs rd = -+method! insert_op_debug op dbg rs rd = - match op with - | Iintop(Imul) -> - self#insert_debug (Iop op) dbg rs [| rd.(0); rs.(0) |]; rd -diff --git a/asmcomp/hppa/selection.ml b/asmcomp/hppa/selection.ml -index a13b527..74c546b 100644 ---- a/asmcomp/hppa/selection.ml -+++ b/asmcomp/hppa/selection.ml -@@ -45,7 +45,7 @@ method select_addressing = function - | arg -> - (Iindexed 0, arg) - --method select_operation op args = -+method! select_operation op args = - match (op, args) with - (* Recognize shift-add operations. *) - ((Caddi|Cadda), -@@ -92,7 +92,7 @@ method select_operation op args = - - (* Deal with register constraints *) - --method insert_op_debug op dbg rs rd = -+method! insert_op_debug op dbg rs rd = - match op with - Iintop(Idiv | Imod) -> (* handled via calls to millicode *) - let rs' = [|phys_reg 20; phys_reg 19|] (* %r26, %r25 *) -diff --git a/asmcomp/ia64/selection.ml b/asmcomp/ia64/selection.ml -index 86d2691..a6a977b 100644 ---- a/asmcomp/ia64/selection.ml -+++ b/asmcomp/ia64/selection.ml -@@ -64,7 +64,7 @@ method is_immediate_add n = n >= -8192 && n < 8192 - - method select_addressing arg = (Iindexed, arg) - --method select_operation op args = -+method! select_operation op args = - let norm_op = - match op with Cadda -> Caddi | Csuba -> Csubi | _ -> op in - let norm_args = -diff --git a/asmcomp/power/selection.ml b/asmcomp/power/selection.ml -index 2818c4f..d87b300 100644 ---- a/asmcomp/power/selection.ml -+++ b/asmcomp/power/selection.ml -@@ -63,7 +63,7 @@ method select_addressing exp = - then (Iindexed2, Ctuple[e1; e2]) - else (Iindexed d, Cop(Cadda, [e1; e2])) - --method select_operation op args = -+method! select_operation op args = - match (op, args) with - (* Prevent the recognition of (x / cst) and (x % cst) when cst is not - a power of 2, which do not correspond to an instruction. *) -diff --git a/asmcomp/sparc/selection.ml b/asmcomp/sparc/selection.ml -index 1053854..737c689 100644 ---- a/asmcomp/sparc/selection.ml -+++ b/asmcomp/sparc/selection.ml -@@ -38,7 +38,7 @@ method select_addressing = function - | arg -> - (Iindexed 0, arg) - --method select_operation op args = -+method! select_operation op args = - match (op, args) with - (* For SPARC V7 multiplication, division and modulus are turned into - calls to C library routines, except if the dividend is a power of 2. --- diff --git a/debian/patches/series b/debian/patches/series index 5d8e3a47..507f0c29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ 0005-Patch-config.sh-for-installation.patch 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch 0007-Set-version-number.patch -0008-Mark-overridden-methods-in-asmcomp-selection.ml-fix-.patch diff --git a/debian/rules b/debian/rules index 16640810..4a517398 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ PACKAGE := ocaml ALL_PACKAGES := $(shell dh_listpackages) OCAMLMAJOR := 3.12 -OCAMLMINOR := 0+dev17+10268 +OCAMLMINOR := 0+dev23+10396 # Build cache (for Debian debugging) BUILDCACHE := $(wildcard ../ocaml.cache)