- Add support for ppc64p7 architecture using new auxv parsing info

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

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 21bac2f..ee2ab7a 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -1088,6 +1088,14 @@ static void defaultMachine(const char ** arch,
        }
 #      endif   /* sparc*-linux */
 
+#      if defined(__linux__) && defined(__powerpc__)
+       {
+            int powerlvl;
+            if (sscanf(rpmat.platform, "power%d", &powerlvl) == 1 && powerlvl > 6)
+                strcpy(un.machine, "ppc64p7");
+        }
+#      endif   /* ppc64*-linux */
+
 #      if defined(__GNUC__) && defined(__alpha__)
        {
            unsigned long amask, implver;

diff --git a/rpmrc.in b/rpmrc.in
index 0033bbd..9b00b71 100644 (file)
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -48,6 +48,7 @@ optflags: ppc32dy4 -O2 -g -fsigned-char
 optflags: ppciseries -O2 -g -fsigned-char
 optflags: ppcpseries -O2 -g -fsigned-char
 optflags: ppc64 -O2 -g -fsigned-char
+optflags: ppc64p7 -O3 -mtune=power7 -mcpu=power7 -g -fsigned-char
 
 optflags: parisc -O2 -g -mpa-risc-1-0
 optflags: hppa1.0 -O2 -g -mpa-risc-1-0
@@ -157,6 +158,7 @@ arch_canon: s390x: s390x    15
 arch_canon:    ppc64:  ppc64   16
 arch_canon:    ppc64pseries: ppc64pseries  16
 arch_canon:    ppc64iseries: ppc64iseries  16
+arch_canon:    ppc64p7: ppc64p7  16
 
 arch_canon:    sh: sh          17
 arch_canon:    sh3: sh3        17
@@ -239,6 +241,7 @@ buildarchtranslate: ppciseries: ppc
 buildarchtranslate: ppcpseries: ppc
 buildarchtranslate: ppc64iseries: ppc64
 buildarchtranslate: ppc64pseries: ppc64
+buildarchtranslate: ppc64p7: ppc64
 
 buildarchtranslate: armv3l: armv3l
 buildarchtranslate: armv4b: armv4b
@@ -307,6 +310,7 @@ arch_compat: ppc: rs6000
 arch_compat: rs6000: noarch fat
 arch_compat: ppc64pseries: ppc64
 arch_compat: ppc64iseries: ppc64
+arch_compat: ppc64p7: ppc64
 
 arch_compat: sun4c: sparc
 arch_compat: sun4d: sparc
@@ -428,6 +432,7 @@ buildarch_compat: ppc: noarch fat
 buildarch_compat: ppc64: noarch fat
 buildarch_compat: ppc64pseries: ppc64
 buildarch_compat: ppc64iseries: ppc64
+buildarch_compat: ppc64p7: ppc64
 
 buildarch_compat: mips: noarch
 buildarch_compat: mipsel: noarch