summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2013-12-31 09:18:32 (GMT)
committerRichard W.M. Jones <rjones@redhat.com>2013-12-31 12:18:07 (GMT)
commit2b6c21aaa3d43c784fa5c10d9edc0e80093d3a2f (patch)
treec183793322c800729ae9f2825dd42ae17a6007ab
parentefb2ca148b9b670ebbbdfbf0b34dddda61499af4 (diff)
downloadocaml-2b6c21aaa3d43c784fa5c10d9edc0e80093d3a2f.zip
ocaml-2b6c21aaa3d43c784fa5c10d9edc0e80093d3a2f.tar.gz
ocaml-2b6c21aaa3d43c784fa5c10d9edc0e80093d3a2f.tar.xz
Add aarch64 (arm64) code generator (correctly this time).
This fixes commit efb2ca148b9b670ebbbdfbf0b34dddda61499af4.
-rw-r--r--ocaml.spec17
1 files changed, 7 insertions, 10 deletions
diff --git a/ocaml.spec b/ocaml.spec
index 1f4cdac..be44d9e 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,6 +1,6 @@
Name: ocaml
Version: 4.01.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: OCaml compiler and programming environment
@@ -80,13 +80,13 @@ Provides: ocaml(compiler) = %{version}
# backend is only available on a subset of architectures.
ExclusiveArch: aarch64 alpha %{arm} ia64 %{ix86} x86_64 ppc ppc64 sparc sparcv9
-%ifarch %{arm} %{ix86} ppc ppc64 sparc sparcv9 x86_64
+%ifarch aarch64 %{arm} %{ix86} ppc ppc64 sparc sparcv9 x86_64
%global native_compiler 1
%else
%global native_compiler 0
%endif
-%ifarch %{arm} %{ix86} ppc ppc64 sparc sparcv9 x86_64
+%ifarch aarch64 %{arm} %{ix86} ppc ppc64 sparc sparcv9 x86_64
%global natdynlink 1
%else
%global natdynlink 0
@@ -364,9 +364,6 @@ fi
%{_bindir}/ocamlopt.opt
%{_bindir}/ocamloptp
%endif
-%ifarch aarch64
-%{_bindir}/ocamloptp
-%endif
#%{_bindir}/ocamlplugininfo
%{_bindir}/ocamlprof
%{_bindir}/ocamlyacc
@@ -486,6 +483,8 @@ fi
%{_bindir}/camlp4*
%{_bindir}/mkcamlp4
%if %{native_compiler}
+# camlp4 doesn't build natively on aarch64 (see patch0011).
+%ifnarch aarch64
%{_libdir}/ocaml/camlp4/*.a
%{_libdir}/ocaml/camlp4/*.cmxa
%{_libdir}/ocaml/camlp4/*.cmx
@@ -499,6 +498,7 @@ fi
%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx
%{_libdir}/ocaml/camlp4/Camlp4Top/*.o
%endif
+%endif
%{_mandir}/man1/*
@@ -515,9 +515,6 @@ fi
%if %{native_compiler}
%{_mandir}/man3/*
%endif
-%ifarch aarch64
-%{_mandir}/man3/*
-%endif
%files emacs
@@ -541,7 +538,7 @@ fi
%changelog
-* Mon Dec 30 2013 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-5
+* Tue Dec 31 2013 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-6
- Add aarch64 (arm64) code generator.
* Thu Nov 21 2013 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-4