mldonkey-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Mldonkey-commits] mldonkey distrib/ChangeLog patches/ocaml-3.11.0...

From: mldonkey-commits
Subject: [Mldonkey-commits] mldonkey distrib/ChangeLog patches/ocaml-3.11.0...
Date: Mon, 28 Mar 2011 18:17:24 +0000 
CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       11/03/28 18:17:24

Modified files:
        distrib        : ChangeLog 
Added files:
        patches        : ocaml-3.11.0.patch ocaml-3.11.1.patch 
                         ocaml-3.11.2.patch 

Log message:
        patch #7495

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1525&r2=1.1526
http://cvs.savannah.gnu.org/viewcvs/mldonkey/patches/ocaml-3.11.0.patch?cvsroot=mldonkey&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/patches/ocaml-3.11.1.patch?cvsroot=mldonkey&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/patches/ocaml-3.11.2.patch?cvsroot=mldonkey&rev=1.1

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1525
retrieving revision 1.1526
diff -u -b -r1.1525 -r1.1526
--- distrib/ChangeLog   20 Mar 2011 17:59:46 -0000      1.1525
+++ distrib/ChangeLog   28 Mar 2011 18:17:24 -0000      1.1526
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2011/03/28
+7495: Fix compilation of Ocaml 3.11.* with recent binutils (ecc, glondu)
+
 2011/03/20
 7506: BT/DHT: show stats, choose random port (ygrek)
 

Index: patches/ocaml-3.11.0.patch
===================================================================
RCS file: patches/ocaml-3.11.0.patch
diff -N patches/ocaml-3.11.0.patch
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/ocaml-3.11.0.patch  28 Mar 2011 18:17:24 -0000      1.1
@@ -0,0 +1,66 @@
+From: Stephane Glondu <address@hidden>
+Date: Tue, 8 Mar 2011 21:17:40 +0100
+Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5237
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
+Authors: Eric Cooper, spiralvoice
+Reviewed-by: Stéphane Glondu <address@hidden>
+---
+ asmcomp/amd64/emit.mlp |   13 +++++++------
+ asmcomp/i386/emit.mlp  |    6 +++---
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
+index 4a3f844..525c6e6 100644
+--- a/asmcomp/amd64/emit.mlp
++++ b/asmcomp/amd64/emit.mlp
+@@ -679,17 +679,18 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
++  begin match Config.system with
++    "linux" | "gnu" ->
++      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
++      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
++    | _ -> ()
++  end;
+   if !float_constants <> [] then begin
+     if macosx
+     then `    .literal8\n`
+     else `    .section        .rodata.cst8,\"a\",@progbits\n`;
+     List.iter emit_float_constant !float_constants
+-  end;
+-  match Config.system with
+-    "linux" | "gnu" ->
+-      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
+-      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
+-  | _ -> ()
++  end
+ 
+ (* Emission of data *)
+ 
+diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
+index 2992f29..0b1252c 100644
+--- a/asmcomp/i386/emit.mlp
++++ b/asmcomp/i386/emit.mlp
+@@ -905,12 +905,12 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
+-  List.iter emit_float_constant !float_constants;
+-  match Config.system with
++  begin match Config.system with
+     "linux_elf" | "bsd_elf" | "gnu" ->
+       `       .type   {emit_symbol fundecl.fun_name},@function\n`;
+       `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
+-  | _ -> ()
++  | _ -> () end;
++  List.iter emit_float_constant !float_constants
+ 
+ 
+ (* Emission of data *)
+-- 

Index: patches/ocaml-3.11.1.patch
===================================================================
RCS file: patches/ocaml-3.11.1.patch
diff -N patches/ocaml-3.11.1.patch
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/ocaml-3.11.1.patch  28 Mar 2011 18:17:24 -0000      1.1
@@ -0,0 +1,66 @@
+From: Stephane Glondu <address@hidden>
+Date: Tue, 8 Mar 2011 21:17:40 +0100
+Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5237
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
+Authors: Eric Cooper, spiralvoice
+Reviewed-by: Stéphane Glondu <address@hidden>
+---
+ asmcomp/amd64/emit.mlp |   13 +++++++------
+ asmcomp/i386/emit.mlp  |    6 +++---
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
+index 4a3f844..525c6e6 100644
+--- a/asmcomp/amd64/emit.mlp
++++ b/asmcomp/amd64/emit.mlp
+@@ -679,17 +679,18 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
++  begin match Config.system with
++    "linux" | "gnu" ->
++      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
++      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
++    | _ -> ()
++  end;
+   if !float_constants <> [] then begin
+     if macosx
+     then `    .literal8\n`
+     else `    .section        .rodata.cst8,\"a\",@progbits\n`;
+     List.iter emit_float_constant !float_constants
+-  end;
+-  match Config.system with
+-    "linux" | "gnu" ->
+-      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
+-      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
+-  | _ -> ()
++  end
+ 
+ (* Emission of data *)
+ 
+diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
+index 2992f29..0b1252c 100644
+--- a/asmcomp/i386/emit.mlp
++++ b/asmcomp/i386/emit.mlp
+@@ -905,12 +905,12 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
+-  List.iter emit_float_constant !float_constants;
+-  match Config.system with
++  begin match Config.system with
+     "linux_elf" | "bsd_elf" | "gnu" ->
+       `       .type   {emit_symbol fundecl.fun_name},@function\n`;
+       `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
+-  | _ -> ()
++  | _ -> () end;
++  List.iter emit_float_constant !float_constants
+ 
+ 
+ (* Emission of data *)
+-- 

Index: patches/ocaml-3.11.2.patch
===================================================================
RCS file: patches/ocaml-3.11.2.patch
diff -N patches/ocaml-3.11.2.patch
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/ocaml-3.11.2.patch  28 Mar 2011 18:17:24 -0000      1.1
@@ -0,0 +1,66 @@
+From: Stephane Glondu <address@hidden>
+Date: Tue, 8 Mar 2011 21:17:40 +0100
+Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5237
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
+Authors: Eric Cooper, spiralvoice
+Reviewed-by: Stéphane Glondu <address@hidden>
+---
+ asmcomp/amd64/emit.mlp |   13 +++++++------
+ asmcomp/i386/emit.mlp  |    6 +++---
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
+index 4a3f844..525c6e6 100644
+--- a/asmcomp/amd64/emit.mlp
++++ b/asmcomp/amd64/emit.mlp
+@@ -679,17 +679,18 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
++  begin match Config.system with
++    "linux" | "gnu" ->
++      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
++      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
++    | _ -> ()
++  end;
+   if !float_constants <> [] then begin
+     if macosx
+     then `    .literal8\n`
+     else `    .section        .rodata.cst8,\"a\",@progbits\n`;
+     List.iter emit_float_constant !float_constants
+-  end;
+-  match Config.system with
+-    "linux" | "gnu" ->
+-      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
+-      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
+-  | _ -> ()
++  end
+ 
+ (* Emission of data *)
+ 
+diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
+index 2992f29..0b1252c 100644
+--- a/asmcomp/i386/emit.mlp
++++ b/asmcomp/i386/emit.mlp
+@@ -905,12 +905,12 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
+-  List.iter emit_float_constant !float_constants;
+-  match Config.system with
++  begin match Config.system with
+     "linux_elf" | "bsd_elf" | "gnu" ->
+       `       .type   {emit_symbol fundecl.fun_name},@function\n`;
+       `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
+-  | _ -> ()
++  | _ -> () end;
++  List.iter emit_float_constant !float_constants
+ 
+ 
+ (* Emission of data *)
+--
reply via email to
[Prev in Thread] Current Thread [Next in Thread]