Commit 171777a4 authored by Andreas Färber's avatar Andreas Färber Committed by Anthony Liguori
Browse files

target-ppc: Turn POWER5gs CPU into alias for POWER5+ 



Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Message-id: 1375321323-29954-2-git-send-email-afaerber@suse.de
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent a7d6b9f0

target-ppc/cpu-models.c

+1 −2
Original line number Diff line number Diff line
@@ -1126,8 +1126,6 @@ 
#if defined(TODO)

    POWERPC_DEF("POWER5+",       CPU_POWERPC_POWER5P,                POWER5P,

                "POWER5+")

    POWERPC_DEF("POWER5gs",      CPU_POWERPC_POWER5GS,               POWER5P,

                "POWER5GS")

#endif

#if defined(TODO)

    POWERPC_DEF("POWER6",        CPU_POWERPC_POWER6,                 POWER6,
@@ -1391,6 +1389,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { 
    { "Boxer", "POWER3" },

    { "Dino",  "POWER3" },

    { "POWER3+", "631" },

    { "POWER5gs", "POWER5+" },

    { "POWER7", "POWER7_v2.3" },

    { "POWER7+", "POWER7+_v2.1" },

    { "POWER8", "POWER8_v1.0" },

target-ppc/cpu-models.h

+0 −1
Original line number Diff line number Diff line
@@ -549,7 +549,6 @@ enum { 
    CPU_POWERPC_POWER5             = 0x003A0203,

#define CPU_POWERPC_POWER5GR         CPU_POWERPC_POWER5

    CPU_POWERPC_POWER5P            = 0x003B0000,

#define CPU_POWERPC_POWER5GS         CPU_POWERPC_POWER5P

    CPU_POWERPC_POWER6             = 0x003E0000,

    CPU_POWERPC_POWER6_5           = 0x0F000001, /* POWER6 in POWER5 mode */

    CPU_POWERPC_POWER6A            = 0x0F000002,