add support for aarch64

diff --git a/cpu-os-macros.a b/cpu-os-macros.a
index abeed44a21b09fce1b5c91334b25526688f55d14..716e45a32fa323dce6e0ffcf1098c73841311ef6 100644 (file)
--- a/cpu-os-macros.a
+++ b/cpu-os-macros.a
@@ -1,5 +1,5 @@
 !<arch>
-//                                              708       `
+//                                              730       `
 alpha-linux.macros/
 alphaev5-linux.macros/
 alphaev56-linux.macros/
@@ -33,6 +33,7 @@ sparc64-linux.macros/
 sparcv9-linux.macros/
 x32-linux.macros/
 x86_64-linux.macros/
+aarch64-linux.macros/
 
 /0              0           0     0     644     336       `
 # Per-platform rpm configuration file.
@@ -684,3 +685,24 @@ k6-linux.macros/0           0     0     644     708       `
 %_multilibno           3
 %_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
 
+/707            1587845877  1000  1000  100644  723       `
+# Per-platform rpm configuration file.
+
+#==============================================================================
+# ---- per-platform macros.
+#
+%_arch                 aarch64
+%_os                   linux
+%_gnu                  -gnu
+%optflags              %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -mtune=generic} -march=armv8-a %{!?nospecflags:%{?specflags_aarch64}}
+
+#==============================================================================
+# ---- configure macros.
+#
+%_lib                  lib64
+
+#---------------------------------------------------------------------
+#      Multilibs
+%_multilibno           2
+%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
+

diff --git a/rpm.spec b/rpm.spec
index c06e8f4b4add85d40255bd5f4464d1c5e33af919..f9d228c498f6f92f7cc51f614b50c03591b80c5a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1087,6 +1087,10 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
 %endif
 
+%ifnarch aarch64
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/aarch64-linux/macros
+%endif
+
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/alpha*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/arm*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia64-linux/macros
@@ -1151,6 +1155,10 @@ i386-[^-]*-[Ll]inux(-gnu)?
 alpha-[^-]*-[Ll]inux(-gnu)?
 %endif
 
+%ifarch aarch64
+aarch64-[^-]*-[Ll]inux(-gnu)?
+%endif
+
 %ifarch ia64
 ia64-[^-]*-[Ll]inux(-gnu)?
 %endif
@@ -1368,6 +1376,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch alpha
 %{_rpmlibdir}/alpha*
 %endif
+%ifarch aarch64
+%{_rpmlibdir}/aarch64*
+%endif
 %ifarch ia64
 %{_rpmlibdir}/ia64*
 %endif