From 469296f1578e1e7b69c267de39d17134b950b93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 1 Aug 2013 03:42:01 +0200 Subject: [PATCH] target-ppc: Turn POWER5gr CPU into alias for POWER5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Färber Signed-off-by: Andreas Färber Message-id: 1375321323-29954-3-git-send-email-afaerber@suse.de Signed-off-by: Anthony Liguori --- target-ppc/cpu-models.c | 3 +-- target-ppc/cpu-models.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c index 1f62f7d1c5..eb1e98292f 100644 --- a/target-ppc/cpu-models.c +++ b/target-ppc/cpu-models.c @@ -1120,8 +1120,6 @@ #if defined(TODO) POWERPC_DEF("POWER5", CPU_POWERPC_POWER5, POWER5, "POWER5") - POWERPC_DEF("POWER5gr", CPU_POWERPC_POWER5GR, POWER5, - "POWER5GR") #endif #if defined(TODO) POWERPC_DEF("POWER5+", CPU_POWERPC_POWER5P, POWER5P, @@ -1389,6 +1387,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "Boxer", "POWER3" }, { "Dino", "POWER3" }, { "POWER3+", "631" }, + { "POWER5gr", "POWER5" }, { "POWER5gs", "POWER5+" }, { "POWER7", "POWER7_v2.3" }, { "POWER7+", "POWER7+_v2.1" }, diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h index ca66d5578d..a79cd1b327 100644 --- a/target-ppc/cpu-models.h +++ b/target-ppc/cpu-models.h @@ -547,7 +547,6 @@ enum { CPU_POWERPC_POWER4P = 0x00380000, /* XXX: missing 0x003A0201 */ CPU_POWERPC_POWER5 = 0x003A0203, -#define CPU_POWERPC_POWER5GR CPU_POWERPC_POWER5 CPU_POWERPC_POWER5P = 0x003B0000, CPU_POWERPC_POWER6 = 0x003E0000, CPU_POWERPC_POWER6_5 = 0x0F000001, /* POWER6 in POWER5 mode */