← Back to branch summary

~ubuntu-branches/debian/sid/ocaml/sid

« back to all changes in this revision

Viewing changes to debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch

  • Committer: Bazaar Package Importer
  • Author(s): Stéphane Glondu
  • Date: 2011-04-21 21:35:08 UTC
  • mfrom: (1.1.11 upstream) (12.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110421213508-kg34453aqmb0moha
* Fixes related to -output-obj with g++ (in debian/patches):
  - add Declare-primitive-name-table-as-const-char
  - add Avoid-multiple-declarations-in-generated-.c-files-in
  - fix Embed-bytecode-in-C-object-when-using-custom: the closing
    brace for extern "C" { ... } was missing in some cases

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
1
1
From: Stephane Glondu <steph@glondu.net>
2
2
Date: Tue, 8 Mar 2011 21:17:40 +0100
3
 
Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
 
3
Subject: Fix ocamlopt w.r.t. binutils 2.21
4
4
MIME-Version: 1.0
5
5
Content-Type: text/plain; charset=UTF-8
6
6
Content-Transfer-Encoding: 8bit
15
15
 2 files changed, 10 insertions(+), 9 deletions(-)
16
16
 
17
17
diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
18
 
index 4a3f844..525c6e6 100644
 
18
index 55da47b..45afbb7 100644
19
19
--- a/asmcomp/amd64/emit.mlp
20
20
+++ b/asmcomp/amd64/emit.mlp
21
 
@@ -679,17 +679,18 @@ let fundecl fundecl =
 
21
@@ -688,17 +688,18 @@ let fundecl fundecl =
22
22
   emit_all true fundecl.fun_body;
23
23
   List.iter emit_call_gc !call_gc_sites;
24
24
   emit_call_bound_errors ();
44
44
 (* Emission of data *)
45
45
 
46
46
diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
47
 
index 2992f29..0b1252c 100644
 
47
index 3baba2e..b29f365 100644
48
48
--- a/asmcomp/i386/emit.mlp
49
49
+++ b/asmcomp/i386/emit.mlp
50
50
@@ -905,12 +905,12 @@ let fundecl fundecl =