diff --git a/ocaml.spec b/ocaml.spec index 50da5f5..d1792c8 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -20,7 +20,7 @@ Name: ocaml Version: 4.02.0 -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.3.git%{shortcommit}%{?dist} Summary: OCaml compiler and programming environment @@ -59,9 +59,10 @@ Patch0008: 0008-arm-arm64-Mark-stack-as-non-executable.patch Patch0009: 0009-arg-Add-no_arg-and-get_arg-helper-functions.patch Patch0010: 0010-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch -# On aarch64 only, the CSE optimization is broken. See: -# http://caml.inria.fr/mantis/view.php?id=6486 -%ifarch aarch64 +# On ARM 32 bit and aarch64, the CSE optimization is broken. See: +# http://caml.inria.fr/mantis/view.php?id=6484 (armv7hl) +# http://caml.inria.fr/mantis/view.php?id=6486 (aarch64) +%ifarch %{arm} aarch64 Patch9999: 0001-Disable-CSE.patch %endif @@ -421,8 +422,8 @@ fi %changelog -* Tue Jul 15 2014 Richard W.M. Jones - 4.02.0-0.2 -- Disable CSE optimization which is broken on aarch64. +* Tue Jul 15 2014 Richard W.M. Jones - 4.02.0-0.3 +- Disable CSE optimization which is broken on armv7hl and aarch64. * Sat Jul 12 2014 Richard W.M. Jones - 4.02.0-0.1 - Update to 4.02.0-beta1 + patches from the upstream 4.02 branch.