AArch64 support v2

Here is my updated patch adding AArch64 support. The main change was to
use CANONCOLOR=3 rather than 2.

--Mark

Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
(cherry picked from commit 8e1ca16c58d478dce53c232d8943124636658cee)

diff --git a/installplatform b/installplatform
index a68b3c0..f5378d8 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -101,6 +101,12 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
        CANONARCH=alpha
        CANONCOLOR=0
        ;;
+    aarch64)
+       ISANAME=aarch
+       ISABITS=64
+       CANONARCH=aarch64
+       CANONCOLOR=3
+       ;;
     noarch)
        CANONARCH=noarch
        CANONCOLOR=0

diff --git a/rpmrc.in b/rpmrc.in
index 5b23db1..55ff25f 100644 (file)
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -83,6 +83,8 @@ optflags: sh3 -O2 -g
 optflags: sh4 -O2 -g -mieee
 optflags: sh4a -O2 -g -mieee
 
+optflags: aarch64 -O2 -g
+
 #############################################################
 # Architecture colors
 
@@ -116,6 +118,8 @@ archcolor: x86_64 2
 archcolor: sh3 1
 archcolor: sh4 1
 
+archcolor: aarch64 2
+
 #############################################################
 # Canonical arch names and numbers
 
@@ -199,6 +203,7 @@ arch_canon: sh3: sh3        17
 arch_canon:    sh4: sh4        17
 arch_canon:    sh4a: sh4a      17
 arch_canon:    xtensa: xtensa  18
+arch_canon:    aarch64: aarch64 19
 
 #############################################################
 # Canonical OS names and numbers
@@ -307,6 +312,8 @@ buildarchtranslate: sh3: sh3
 buildarchtranslate: sh4: sh4
 buildarchtranslate: sh4a: sh4
 
+buildarchtranslate: aarch64: aarch64
+
 #############################################################
 # Architecture compatibility
 
@@ -397,6 +404,8 @@ arch_compat: sh3: noarch
 arch_compat: sh4: noarch
 arch_compat: sh4a: sh4
 
+arch_compat: aarch64: noarch
+
 os_compat:   IRIX64: IRIX
 os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
 os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5
@@ -428,6 +437,8 @@ os_compat: Darwin: MacOSX
 
 buildarch_compat: ia64: noarch
 
+buildarch_compat: aarch64: noarch
+
 buildarch_compat: athlon: i686
 buildarch_compat: geode: i586
 buildarch_compat: pentium4: pentium3