From b0bfee6eb4b3363ca97d83bb590d7ac5cf8098d7 Mon Sep 17 00:00:00 2001
From: David Edelsohn <edelsohn@gnu.org>
Date: Mon, 27 Jun 2005 17:17:16 +0000
Subject: [PATCH] rs6000.c (rs6000_file_start): Note PPC405 erratum in
 verbose_asm output.

	* config/rs6000/rs6000.c (rs6000_file_start): Note PPC405 erratum
	in verbose_asm output.
	* config/rs6000/rs6000.h (PPC405_ERRATUM77): Bracket with
	CONFIG_PPC405CR.
	* config.gcc (powerpc with_which): Define CONFIG_PPC405CR for
	405cr.

From-SVN: r101356
---
 gcc/ChangeLog              | 9 +++++++++
 gcc/config.gcc             | 4 ++++
 gcc/config/rs6000/rs6000.c | 8 ++++++++
 gcc/config/rs6000/rs6000.h | 3 +--
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ee61b3fe50..4919e3bfebe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-27  David Edelsohn  <edelsohn@gnu.org>
+
+	* config/rs6000/rs6000.c (rs6000_file_start): Note PPC405 erratum
+	in verbose_asm output.
+	* config/rs6000/rs6000.h (PPC405_ERRATUM77): Bracket with
+	CONFIG_PPC405CR.
+	* config.gcc (powerpc with_which): Define CONFIG_PPC405CR for
+	405cr.
+
 2005-06-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* builtin-attrs.def (DEF_ATTR_FOR_INT): Add for 5 and 6.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index a3f56637e57..66cced208ca 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2637,6 +2637,10 @@ case "${target}" in
 				with_which="with_$which"
 				eval $with_which=
 				;;
+			405cr)
+				tm_defines="${tm_defines} CONFIG_PPC405CR"
+				eval "with_$which=405"
+				;;
 			"" | common \
 			| power | power[2345] | powerpc | powerpc64 \
 			| rios | rios1 | rios2 | rsc | rsc1 | rs64a \
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index f29ba870dfa..bd78ecab5e2 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1850,6 +1850,14 @@ rs6000_file_start (void)
 	    }
 	}
 
+#ifdef CONFIG_PPC405CR
+      if (rs6000_cpu == PROCESSOR_PPC405)
+	{
+	  fprint (file, "%s PPC405CR_ERRATUM77", start);
+	  start = "";
+	}
+#endif
+
 #ifdef USING_ELFOS_H
       switch (rs6000_sdata)
 	{
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 85ea2eadc67..fa7340f393f 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -50,8 +50,7 @@
 #endif
 
 /* If configured for PPC405, support PPC405CR Erratum77.  */
-#define PPC405_CPU_DEFAULT ("405")
-#if #TARGET_CPU_DEFAULT == #PPC405_CPU_DEFAULT
+#ifdef CONFIG_PPC405CR
 #define PPC405_ERRATUM77 (rs6000_cpu == PROCESSOR_PPC405)
 #else
 #define PPC405_ERRATUM77 0
-- 
2.30.2