https://gcc.gnu.org/g:ed2ed00cc99e53cdbb4ca675882a103c412dc6b8
commit ed2ed00cc99e53cdbb4ca675882a103c412dc6b8
Author: Michael Meissner <meiss...@linux.ibm.com>
Date: Wed Jul 31 13:07:18 2024 -0400
Revert changes
Diff:
---
gcc/ChangeLog.meissner | 14 +-------------
gcc/config/rs6000/rs6000-arch.def | 2 --
gcc/config/rs6000/rs6000-c.cc | 4 ++--
gcc/config/rs6000/rs6000.cc | 10 +---------
4 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/gcc/ChangeLog.meissner b/gcc/ChangeLog.meissner
index b63c515f38e5..ece220b9bd2c 100644
--- a/gcc/ChangeLog.meissner
+++ b/gcc/ChangeLog.meissner
@@ -1,16 +1,4 @@
-==================== Branch work174, patch #13 ====================
-
-Add gp, gfx to arch flags.
-
-2024-07-31 Michael Meissner <meiss...@linux.ibm.com>
-
-gcc/
-
- * config/rs6000/rs6000-arch.def (ARCH_MASK_GP): Add gp.
- (ARCH_MASK_GFX): Add gfx.
- * config/rs6000/rs6000-c.cc (rs6000_target_modify_macros): Use arch
- masks for gp and gfx.
- * config/rs6000/rs6000.cc (get_arch_flags): Add support for gp and gfx.
+==================== Branch work174, patch #13 was reverted
====================
==================== Branch work174, patch #12 ====================
diff --git a/gcc/config/rs6000/rs6000-arch.def
b/gcc/config/rs6000/rs6000-arch.def
index 91bd2f638cf3..e5b6e9581331 100644
--- a/gcc/config/rs6000/rs6000-arch.def
+++ b/gcc/config/rs6000/rs6000-arch.def
@@ -37,8 +37,6 @@
the appropriate architecture flags based on the actual processor
enumeration. */
-ARCH_EXPAND(GPOPT, "gpopt")
-ARCH_EXPAND(GFXOPT, "gfxopt")
ARCH_EXPAND(POWER4, "power4")
ARCH_EXPAND(POWER5, "power5")
ARCH_EXPAND(POWER5X, "power5+")
diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index 63cf580b20b4..d7b1625f0867 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -414,9 +414,9 @@ rs6000_target_modify_macros (bool define_p, HOST_WIDE_INT
flags,
/* rs6000_isa_flags and rs6000_arch_flags based options. */
rs6000_define_or_undefine_macro (define_p, "_ARCH_PPC");
- if ((arch_flags & ARCH_MASK_GPOPT) != 0)
+ if ((flags & OPTION_MASK_PPC_GPOPT) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PPCSQ");
- if ((arch_flags & ARCH_MASK_GFXOPT) != 0)
+ if ((flags & OPTION_MASK_PPC_GFXOPT) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PPCGR");
if ((flags & OPTION_MASK_POWERPC64) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PPC64");
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 17c22dc59117..c89a6ea8e792 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -1827,9 +1827,7 @@ get_arch_flags (int cpu_index)
{
HOST_WIDE_INT ret = 0;
- const HOST_WIDE_INT ARCH_COMBO_POWER4 = (ARCH_MASK_POWER4
- | ARCH_MASK_GPOPT
- | ARCH_MASK_GFXOPT);
+ const HOST_WIDE_INT ARCH_COMBO_POWER4 = ARCH_MASK_POWER4;
const HOST_WIDE_INT ARCH_COMBO_POWER5 = ARCH_MASK_POWER5 |
ARCH_COMBO_POWER4;
const HOST_WIDE_INT ARCH_COMBO_POWER5X = ARCH_MASK_POWER5X |
ARCH_COMBO_POWER5;
const HOST_WIDE_INT ARCH_COMBO_POWER6 = ARCH_MASK_POWER6 |
ARCH_COMBO_POWER5X;
@@ -1890,12 +1888,6 @@ get_arch_flags (int cpu_index)
if (TARGET_CMPB)
ret |= ARCH_MASK_POWER6;
-
- if (TARGET_PPC_GPOPT)
- ret |= ARCH_MASK_GPOPT;
-
- if (TARGET_PPC_GFXOPT)
- ret |= ARCH_MASK_GFXOPT;
break;
}
