rs6000.c (rs6000_override_options): Add G3, G4, and G5 marketing names to the list of supported processors.

2003-10-28  Syd Polk <spolk@apple.com>

	* config/rs6000/rs6000.c (rs6000_override_options): Add G3, G4, and G5
	marketing names to the list of supported processors.
	* config/rs6000/rs6000.h: Ditto.
	* doc/invoke.texi: Ditto.
	* config.gcc: Ditto.

From-SVN: r73228

5 files changed, 30 insertions, 4 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 39a83e9..e9c1713 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-03  Syd Polk  <spolk@apple.com>
+
+	* config/rs6000/rs6000.c (rs6000_override_options): Add G3, G4, and G5
+	marketing names to the list of supported processors.
+	* config/rs6000/rs6000.h: Ditto.
+	* doc/invoke.texi: Ditto.
+	* config.gcc: Ditto.
+
 2003-11-03  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* fixinc/inclhack.def (stdio_va_list): Allow tab before va_list.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5249689..9c1f15f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2502,7 +2502,7 @@ fi
 			| 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
 			| 601 | 602 | 603 | 603e | ec603e | 604 \
 			| 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-			| 8540 | 801 | 821 | 823 | 860 | 970)
+			| 8540 | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5)
 				# OK
 				;;
 			*)
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 8c042b5..e7191a6 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -678,12 +678,18 @@ rs6000_override_options (const char *default_cpu)
 	 {"750", PROCESSOR_PPC750,
  	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
  	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
+	 {"G3", PROCESSOR_PPC750,
+ 	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+ 	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"7400", PROCESSOR_PPC7400,
             MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
             POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"7450", PROCESSOR_PPC7450,
             MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
             POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
+	 {"G4", PROCESSOR_PPC7450,
+            MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+            POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"8540", PROCESSOR_PPC8540,
 	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
 	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
@@ -701,6 +707,9 @@ rs6000_override_options (const char *default_cpu)
 	    POWER_MASKS | POWERPC_OPT_MASKS | MASK_POWERPC64},
 	 {"970", PROCESSOR_POWER4,
 	    MASK_POWERPC | POWERPC_OPT_MASKS | MASK_NEW_MNEMONICS,
+	    POWER_MASKS},
+	 {"G5", PROCESSOR_POWER4,
+	    MASK_POWERPC | POWERPC_OPT_MASKS | MASK_NEW_MNEMONICS,
 	    POWER_MASKS}};
 
   const size_t ptt_size = ARRAY_SIZE (processor_target_table);
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 2f881c7..95078ec 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -84,11 +84,15 @@
 %{mcpu=740: -mppc} \
 %{mcpu=7400: -mppc} \
 %{mcpu=7450: -mppc} \
+%{mcpu=G4: -mppc} \
 %{mcpu=750: -mppc} \
+%{mcpu=G3: -mppc} \
 %{mcpu=801: -mppc} \
 %{mcpu=821: -mppc} \
 %{mcpu=823: -mppc} \
 %{mcpu=860: -mppc} \
+%{mcpu=970: -mpower4} \
+%{mcpu=G5: -mpower4} \
 %{mcpu=8540: -me500} \
 %{maltivec: -maltivec}"
 
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index f5f5938..b430af6 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -7278,9 +7278,10 @@ instruction scheduling parameters for machine type @var{cpu_type}.
 Supported values for @var{cpu_type} are @samp{rios}, @samp{rios1},
 @samp{rsc}, @samp{rios2}, @samp{rs64a}, @samp{601}, @samp{602},
 @samp{603}, @samp{603e}, @samp{604}, @samp{604e}, @samp{620},
-@samp{630}, @samp{740}, @samp{7400}, @samp{7450}, @samp{750},
-@samp{power}, @samp{power2}, @samp{powerpc}, @samp{403}, @samp{505},
-@samp{801}, @samp{821}, @samp{823}, and @samp{860} and @samp{common}.
+@samp{630}, @samp{740}, @samp{7400}, @samp{7450}, @samp{G4}, 
+@samp{750}, @samp{G3},  @samp{power}, @samp{power2}, @samp{powerpc}, 
+@samp{403}, @samp{505}, @samp{801}, @samp{821}, @samp{823}, @samp{860},
+@samp{970}, @samp{G5} and @samp{common}.
 
 @option{-mcpu=common} selects a completely generic processor.  Code
 generated under this option will run on any POWER or PowerPC processor.
@@ -7323,8 +7324,12 @@ The @option{-mcpu} options automatically enable or disable other
 @itemx 740
 @itemx 7400
 @itemx 7450
+@itemx G4
 @itemx 750
+@itemx G3
 @itemx 505
+@itemx 970
+@itemx G5
 @option{-mno-power}, @option{-mpowerpc}, @option{-mnew-mnemonics}
 
 @item 601