Add aarch64 (arm64) code generator (correctly this time).

This fixes commit efb2ca148b.
This commit is contained in:
Richard W.M. Jones 2013-12-31 09:18:32 +00:00
parent efb2ca148b
commit 2b6c21aaa3

View File

@ -1,6 +1,6 @@
Name: ocaml Name: ocaml
Version: 4.01.0 Version: 4.01.0
Release: 5%{?dist} Release: 6%{?dist}
Summary: OCaml compiler and programming environment Summary: OCaml compiler and programming environment
@ -80,13 +80,13 @@ Provides: ocaml(compiler) = %{version}
# backend is only available on a subset of architectures. # backend is only available on a subset of architectures.
ExclusiveArch: aarch64 alpha %{arm} ia64 %{ix86} x86_64 ppc ppc64 sparc sparcv9 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 %global native_compiler 1
%else %else
%global native_compiler 0 %global native_compiler 0
%endif %endif
%ifarch %{arm} %{ix86} ppc ppc64 sparc sparcv9 x86_64 %ifarch aarch64 %{arm} %{ix86} ppc ppc64 sparc sparcv9 x86_64
%global natdynlink 1 %global natdynlink 1
%else %else
%global natdynlink 0 %global natdynlink 0
@ -364,9 +364,6 @@ fi
%{_bindir}/ocamlopt.opt %{_bindir}/ocamlopt.opt
%{_bindir}/ocamloptp %{_bindir}/ocamloptp
%endif %endif
%ifarch aarch64
%{_bindir}/ocamloptp
%endif
#%{_bindir}/ocamlplugininfo #%{_bindir}/ocamlplugininfo
%{_bindir}/ocamlprof %{_bindir}/ocamlprof
%{_bindir}/ocamlyacc %{_bindir}/ocamlyacc
@ -486,6 +483,8 @@ fi
%{_bindir}/camlp4* %{_bindir}/camlp4*
%{_bindir}/mkcamlp4 %{_bindir}/mkcamlp4
%if %{native_compiler} %if %{native_compiler}
# camlp4 doesn't build natively on aarch64 (see patch0011).
%ifnarch aarch64
%{_libdir}/ocaml/camlp4/*.a %{_libdir}/ocaml/camlp4/*.a
%{_libdir}/ocaml/camlp4/*.cmxa %{_libdir}/ocaml/camlp4/*.cmxa
%{_libdir}/ocaml/camlp4/*.cmx %{_libdir}/ocaml/camlp4/*.cmx
@ -499,6 +498,7 @@ fi
%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx %{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx
%{_libdir}/ocaml/camlp4/Camlp4Top/*.o %{_libdir}/ocaml/camlp4/Camlp4Top/*.o
%endif %endif
%endif
%{_mandir}/man1/* %{_mandir}/man1/*
@ -515,9 +515,6 @@ fi
%if %{native_compiler} %if %{native_compiler}
%{_mandir}/man3/* %{_mandir}/man3/*
%endif %endif
%ifarch aarch64
%{_mandir}/man3/*
%endif
%files emacs %files emacs
@ -541,7 +538,7 @@ fi
%changelog %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. - Add aarch64 (arm64) code generator.
* Thu Nov 21 2013 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-4 * Thu Nov 21 2013 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-4