diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
| commit | d59c722c306fa39fcecf011b411b77faffca5cbd (patch) | |
| tree | d6a3582523245b624d1a905d4b46d8344429e617 /staging/ocaml/fix-ocaml-binutils-2.21.patch | |
| parent | 939541abc901bd03328b55aaed0fb1862f803c05 (diff) | |
| parent | 5894dd675f4bd3ba296d262fae99b3b87a0f87fd (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gri/PKGBUILD
community/multiget/PKGBUILD
core/bash/PKGBUILD
core/grep/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/dib0700-fix.patch
libre/linux-libre/i915-fix-ghost-tv-output.patch
libre/linux-libre/i915-fix-incorrect-error-message.patch
libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
libre/linux-libre/linux-libre.install
libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
Diffstat (limited to 'staging/ocaml/fix-ocaml-binutils-2.21.patch')
| -rw-r--r-- | staging/ocaml/fix-ocaml-binutils-2.21.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/staging/ocaml/fix-ocaml-binutils-2.21.patch b/staging/ocaml/fix-ocaml-binutils-2.21.patch new file mode 100644 index 000000000..fa7664cec --- /dev/null +++ b/staging/ocaml/fix-ocaml-binutils-2.21.patch @@ -0,0 +1,66 @@ +From: Stephane Glondu <steph@glondu.net> +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 <steph@glondu.net> +--- + 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 *) +-- |