From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 0DCEE3858C42; Sat, 17 Feb 2024 00:09:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DCEE3858C42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708128590; bh=HdmWd/a1eAimC4YSpz7jqXGfacqCM7/dR5tblGcPf94=; h=From:To:Subject:Date:From; b=tUAZecm6uIC/8Yx2R7+3iaSARQqofYv7Lzlt0d5c4MYw/lBaE5y3zNe96yYEJGEmf q3zZW/dZEKtCcvMpGumFiJOJMMbPfh/tEK2E5/4X6CsTrfsbkaJBMHLerwma2Yromx tPSwwThC4RYZs4UEyLsItkfYEGMF2caTmh/C/Mmk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Meissner To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work158-pnext)] Revert changes X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work158-pnext X-Git-Oldrev: f678bb81d9bffa8896d3fb4714d7a226fe79464c X-Git-Newrev: 49e99aa9889760848b18cbb08d7aa9fc1681ab3f Message-Id: <20240217000950.0DCEE3858C42@sourceware.org> Date: Sat, 17 Feb 2024 00:09:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:49e99aa9889760848b18cbb08d7aa9fc1681ab3f commit 49e99aa9889760848b18cbb08d7aa9fc1681ab3f Author: Michael Meissner Date: Fri Feb 16 19:09:45 2024 -0500 Revert changes Diff: --- gcc/config/rs6000/driver-rs6000.cc | 2 -- gcc/config/rs6000/ppc-auxv.h | 3 +-- gcc/config/rs6000/rs6000-builtin.cc | 1 - gcc/testsuite/gcc.target/powerpc/power11-1.c | 13 ------------- gcc/testsuite/gcc.target/powerpc/power11-2.c | 20 -------------------- gcc/testsuite/gcc.target/powerpc/power11-3.c | 10 ---------- gcc/testsuite/lib/target-supports.exp | 17 ----------------- 7 files changed, 1 insertion(+), 65 deletions(-) diff --git a/gcc/config/rs6000/driver-rs6000.cc b/gcc/config/rs6000/driver-rs6000.cc index 3f69695d6935..244b3388c2ad 100644 --- a/gcc/config/rs6000/driver-rs6000.cc +++ b/gcc/config/rs6000/driver-rs6000.cc @@ -451,7 +451,6 @@ static const struct asm_name asm_names[] = { { "power8", "-mpwr8" }, { "power9", "-mpwr9" }, { "power10", "-mpwr10" }, - { "power11", "-mpwr11" }, { "powerpc", "-mppc" }, { "rs64", "-mppc" }, { "603", "-m603" }, @@ -480,7 +479,6 @@ static const struct asm_name asm_names[] = { { "power8", "%{mpower9-vector:-mpower9;:-mpower8}" }, { "power9", "-mpower9" }, { "power10", "-mpower10" }, - { "power11", "-mpower11" }, { "a2", "-ma2" }, { "powerpc", "-mppc" }, { "powerpc64", "-mppc64" }, diff --git a/gcc/config/rs6000/ppc-auxv.h b/gcc/config/rs6000/ppc-auxv.h index 4e8636443f94..364bba427d14 100644 --- a/gcc/config/rs6000/ppc-auxv.h +++ b/gcc/config/rs6000/ppc-auxv.h @@ -47,10 +47,9 @@ #define PPC_PLATFORM_PPC476 12 #define PPC_PLATFORM_POWER8 13 #define PPC_PLATFORM_POWER9 14 -#define PPC_PLATFORM_POWER10 15 /* This is not yet official. */ -#define PPC_PLATFORM_POWER11 16 +#define PPC_PLATFORM_POWER10 15 /* AT_HWCAP bits. These must match the values defined in the Linux kernel. */ #define PPC_FEATURE_32 0x80000000 diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc index f3ba1eccdbdc..6698274031b9 100644 --- a/gcc/config/rs6000/rs6000-builtin.cc +++ b/gcc/config/rs6000/rs6000-builtin.cc @@ -2493,7 +2493,6 @@ static const struct const char *cpu; unsigned int cpuid; } cpu_is_info[] = { - { "power11", PPC_PLATFORM_POWER11 }, { "power10", PPC_PLATFORM_POWER10 }, { "power9", PPC_PLATFORM_POWER9 }, { "power8", PPC_PLATFORM_POWER8 }, diff --git a/gcc/testsuite/gcc.target/powerpc/power11-1.c b/gcc/testsuite/gcc.target/powerpc/power11-1.c deleted file mode 100644 index 6a2e802eedf3..000000000000 --- a/gcc/testsuite/gcc.target/powerpc/power11-1.c +++ /dev/null @@ -1,13 +0,0 @@ -/* { dg-do compile { target powerpc*-*-* } } */ -/* { dg-require-effective-target power11_ok } */ -/* { dg-options "-mdejagnu-cpu=power11 -O2" } */ - -/* Basic check to see if the compiler supports -mcpu=power11. */ - -#ifndef _ARCH_PWR11 -#error "-mcpu=power11 is not supported" -#endif - -void foo (void) -{ -} diff --git a/gcc/testsuite/gcc.target/powerpc/power11-2.c b/gcc/testsuite/gcc.target/powerpc/power11-2.c deleted file mode 100644 index 7b9904c1d294..000000000000 --- a/gcc/testsuite/gcc.target/powerpc/power11-2.c +++ /dev/null @@ -1,20 +0,0 @@ -/* { dg-do compile { target powerpc*-*-* } } */ -/* { dg-require-effective-target power11_ok } */ -/* { dg-options "-O2" } */ - -/* Check if we can set the power11 target via a target attribute. */ - -__attribute__((__target__("cpu=power9"))) -void foo_p9 (void) -{ -} - -__attribute__((__target__("cpu=power10"))) -void foo_p10 (void) -{ -} - -__attribute__((__target__("cpu=power11"))) -void foo_p11 (void) -{ -} diff --git a/gcc/testsuite/gcc.target/powerpc/power11-3.c b/gcc/testsuite/gcc.target/powerpc/power11-3.c deleted file mode 100644 index f221a70d3b30..000000000000 --- a/gcc/testsuite/gcc.target/powerpc/power11-3.c +++ /dev/null @@ -1,10 +0,0 @@ -/* { dg-do compile { target powerpc*-*-* } } */ -/* { dg-require-effective-target power11_ok } */ -/* { dg-options "-mdejagnu=power8 -O2" } */ - -/* Check if we can set the power11 target via a target_clones attribute. */ - -__attribute__((__target_clones__("cpu=power11,cpu=power9,default"))) -void foo (void) -{ -} diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index cbd3e3eeb06b..6ce8557c9a9d 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -7160,23 +7160,6 @@ proc check_effective_target_power10_ok { } { } } -# Return 1 if this is a PowerPC target supporting -mcpu=power11. - -proc check_effective_target_power11_ok { } { - if { ([istarget powerpc64*-*-linux*]) } { - return [check_no_compiler_messages power11_ok object { - int main (void) { - #ifndef _ARCH_PWR11 - #error "-mcpu=power11 is not supported" - #endif - return 0; - } - } "-mcpu=power11"] - } else { - return 0 - } -} - # Return 1 if this is a PowerPC target supporting -mfloat128 via either # software emulation on power7/power8 systems or hardware support on power9.