summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Knirsch <pknirsch@redhat.com>2012-04-16 19:05:18 +0200
committerPanu Matilainen <pmatilai@redhat.com>2012-04-17 09:26:03 +0300
commitf9eedd7f694a3dd3db637089f978dab4bd6858ee (patch)
treef3e6fa447618ae0760a6ef568f4f393b0d6fa952
parent280494cce023f3938023b9b2b1173405601e4ddf (diff)
downloadlibrpm-tizen-f9eedd7f694a3dd3db637089f978dab4bd6858ee.tar.gz
librpm-tizen-f9eedd7f694a3dd3db637089f978dab4bd6858ee.tar.bz2
librpm-tizen-f9eedd7f694a3dd3db637089f978dab4bd6858ee.zip
- Add support for ppc64p7 architecture using new auxv parsing info
Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
-rw-r--r--lib/rpmrc.c8
-rw-r--r--rpmrc.in5
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index edb9cd687..ba156fe88 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -1090,6 +1090,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 b62633939..d2fc8d120 100644
--- 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
@@ -190,6 +191,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
@@ -272,6 +274,7 @@ buildarchtranslate: ppciseries: ppc
buildarchtranslate: ppcpseries: ppc
buildarchtranslate: ppc64iseries: ppc64
buildarchtranslate: ppc64pseries: ppc64
+buildarchtranslate: ppc64p7: ppc64
buildarchtranslate: armv3l: armv3l
buildarchtranslate: armv4b: armv4b
@@ -340,6 +343,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
@@ -461,6 +465,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