https://gcc.gnu.org/g:b0847289e8894dd1069958bd902bcd66df5c0c71
commit b0847289e8894dd1069958bd902bcd66df5c0c71
Author: Michael Meissner <meiss...@linux.ibm.com>
Date: Tue Jul 30 16:51:34 2024 -0400
Revert changes
Diff:
---
gcc/ChangeLog.meissner | 13 +------------
gcc/config/rs6000/rs6000-arch.def | 3 ---
gcc/config/rs6000/rs6000-c.cc | 6 +++---
gcc/config/rs6000/rs6000.cc | 4 ----
4 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/gcc/ChangeLog.meissner b/gcc/ChangeLog.meissner
index 16ad0870ec3e..0f6cd95f9269 100644
--- a/gcc/ChangeLog.meissner
+++ b/gcc/ChangeLog.meissner
@@ -1,15 +1,4 @@
-==================== Branch work174, patch #7 ====================
-
-Add more processors to arch flags.
-
-2024-07-30 Michael Meissner <meiss...@linux.ibm.com>
-
- * config/rs6000/rs6000-arch.def: Add support for 476, a2, and cell
- processors.
- * config/rs6000/rs6000-c.cc (rs6000_target_modify_macros): Use arch
- flags for power4, power5, and power6.
- * config/rs6000/rs6000.cc (get_arch_flags): Add 476, a2, and cell
- processors.
+==================== Branch work174, patch #7 was reverted ====================
==================== Branch work174, patch #6 ====================
diff --git a/gcc/config/rs6000/rs6000-arch.def
b/gcc/config/rs6000/rs6000-arch.def
index 96f176775b59..6725736076da 100644
--- a/gcc/config/rs6000/rs6000-arch.def
+++ b/gcc/config/rs6000/rs6000-arch.def
@@ -37,9 +37,6 @@
the appropriate architecture flags based on the actual processor
enumeration. */
-ARCH_EXPAND(PPC476, "476")
-ARCH_EXPAND(PPCA2, "a2")
-ARCH_EXPAND(CELL, "cell")
ARCH_EXPAND(POWER4, "power4")
ARCH_EXPAND(POWER5, "power5")
ARCH_EXPAND(POWER6, "power6")
diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index 27f18f48e837..a8a6a956874f 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -420,13 +420,13 @@ rs6000_target_modify_macros (bool define_p, HOST_WIDE_INT
flags,
rs6000_define_or_undefine_macro (define_p, "_ARCH_PPCGR");
if ((flags & OPTION_MASK_POWERPC64) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PPC64");
- if ((arch_flags & ARCH_MASK_POWER4) != 0)
+ if ((flags & OPTION_MASK_MFCRF) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PWR4");
- if ((arch_flags & ARCH_MASK_POWER5) != 0)
+ if ((flags & OPTION_MASK_POPCNTB) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PWR5");
if ((flags & OPTION_MASK_FPRND) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PWR5X");
- if ((arch_flags & ARCH_MASK_POWER6) != 0)
+ if ((flags & OPTION_MASK_CMPB) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PWR6");
if ((arch_flags & ARCH_MASK_POWER7) != 0)
rs6000_define_or_undefine_macro (define_p, "_ARCH_PWR7");
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index f9ccaa67e619..19adc66cc801 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -1851,18 +1851,14 @@ get_arch_flags (int cpu_index)
/* fall through. */
case PROCESSOR_POWER6:
- case PROCESSOR_PPCA2:
ret |= ARCH_MASK_POWER6;
/* fall through. */
- case PROCESSOR_PPC476:
case PROCESSOR_POWER5:
ret |= ARCH_MASK_POWER5;
/* fall through. */
- case PROCESSOR_CELL:
case PROCESSOR_POWER4:
- case PROCESSOR_PPCE6500:
ret |= ARCH_MASK_POWER4;
break;
