configure.in (alpha-osf, [...]): Handle ev6[78].

        * configure.in (alpha-osf, alpha-linux): Handle ev6[78].
        * alpha.c (override_options): Recognize -mcpu=ev67.
        * alpha.h (CPP_CPU_EV67_SPEC): New.
        (CPP_CPU_DEFAULT_SPEC): Examine TARGET_CPU_DEFAULT to use it.
        (EXTRA_SPECS): Update.

From-SVN: r30923

5 files changed, 44 insertions, 3 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index da2ec92..6d72070 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,23 @@
+Tue Dec 14 08:11:27 1999  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in (alpha-osf, alpha-linux): Handle ev6[78].
+	* alpha.c (override_options): Recognize -mcpu=ev67.
+	* alpha.h (CPP_CPU_EV67_SPEC): New.
+	(CPP_CPU_DEFAULT_SPEC): Examine TARGET_CPU_DEFAULT to use it.
+	(EXTRA_SPECS): Update.
+
+Tue Dec 14 08:04:28 1999  Richard Henderson  <rth@cygnus.com>
+
+	* cppp.c (main): Set trigraphs and __STRICT_ANSI__ as
+	appropriate for -lang-c89 and -std=*.
+	* cppinit.c (cpp_handle_option): Likewise.
+	(new_pending_define): New, split out from cpp_handle_option.
+	* gcc.c (default_compilers): Don't define __STRICT_ANSI__
+	or enable trigraphs for -ansi/-std=*.
+
+	* ginclude/stdarg.h (__va_copy): New.
+	(va_copy): Don't define for C89.
+
 Tue Dec 14 08:37:27 CST 1999 Clinton Popetz  <cpopetz@cygnus.com>
 
 	* config/arm/arm.md (mulsidi3adddi, umulsidi3adddi): New patterns
@@ -279,7 +299,7 @@ Fri Dec 10 16:12:13 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
 1999-12-10  Ben Collins  <bcollins@debian.org>
 
-        * configure.in: Fix typo for "-64" in 64bit as check.
+	* configure.in: Fix typo for "-64" in 64bit as check.
 	* configure: Rebuilt.
 	
 1999-12-10  Jakub Jelinek  <jakub@redhat.com>
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index e790fc0..b875c67 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -231,6 +231,12 @@ override_options ()
 	  target_flags |= MASK_BWX | MASK_MAX | MASK_FIX;
 	  target_flags &= ~ (MASK_CIX);
 	}
+      else if (! strcmp (alpha_cpu_string, "ev67")
+	       || ! strcmp (alpha_cpu_string, "21264a"))
+	{
+	  alpha_cpu = PROCESSOR_EV6;
+	  target_flags |= MASK_BWX | MASK_MAX | MASK_FIX | MASK_CIX;
+	}
       else
 	error ("bad value `%s' for -mcpu switch", alpha_cpu_string);
     }
diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 2266f50..4e5af7b 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -276,11 +276,18 @@ extern const char *alpha_mlat_string;	/* For -mmemory-latency= */
 #define CPP_CPU_EV5_SPEC	"%(cpp_im_ev5)"
 #define CPP_CPU_EV56_SPEC	"%(cpp_im_ev5) %(cpp_am_bwx)"
 #define CPP_CPU_PCA56_SPEC	"%(cpp_im_ev5) %(cpp_am_bwx) %(cpp_am_max)"
-#define CPP_CPU_EV6_SPEC	"%(cpp_im_ev6) %(cpp_am_bwx) %(cpp_am_max) %(cpp_am_fix)"
+#define CPP_CPU_EV6_SPEC \
+  "%(cpp_im_ev6) %(cpp_am_bwx) %(cpp_am_max) %(cpp_am_fix)"
+#define CPP_CPU_EV67_SPEC \
+  "%(cpp_im_ev6) %(cpp_am_bwx) %(cpp_am_max) %(cpp_am_fix) %(cpp_am_cix)"
 
 #ifndef CPP_CPU_DEFAULT_SPEC
 # if TARGET_CPU_DEFAULT & MASK_CPU_EV6
-#  define CPP_CPU_DEFAULT_SPEC		CPP_CPU_EV6_SPEC
+#  if TARGET_CPU_DEFAULT & MAX_CIX
+#    define CPP_CPU_DEFAULT_SPEC	CPP_CPU_EV67_SPEC
+#  else
+#    define CPP_CPU_DEFAULT_SPEC	CPP_CPU_EV6_SPEC
+#  endif
 # else
 #  if TARGET_CPU_DEFAULT & MASK_CPU_EV5
 #   if TARGET_CPU_DEFAULT & MASK_MAX
@@ -306,6 +313,7 @@ extern const char *alpha_mlat_string;	/* For -mmemory-latency= */
 %{mcpu=ev56|mcpu=21164a:%(cpp_cpu_ev56) }\
 %{mcpu=pca56|mcpu=21164pc|mcpu=21164PC:%(cpp_cpu_pca56) }\
 %{mcpu=ev6|mcpu=21264:%(cpp_cpu_ev6) }\
+%{mcpu=ev67|mcpu=21264a:%(cpp_cpu_ev67) }\
 %{!mcpu*:%(cpp_cpu_default) }}"
 #endif
 
@@ -336,6 +344,7 @@ extern const char *alpha_mlat_string;	/* For -mmemory-latency= */
   { "cpp_cpu_ev56", CPP_CPU_EV56_SPEC },	\
   { "cpp_cpu_pca56", CPP_CPU_PCA56_SPEC },	\
   { "cpp_cpu_ev6", CPP_CPU_EV6_SPEC },		\
+  { "cpp_cpu_ev67", CPP_CPU_EV67_SPEC },	\
   { "cpp_cpu_default", CPP_CPU_DEFAULT_SPEC },	\
   { "cpp_cpu", CPP_CPU_SPEC },			\
   { "cpp_subtarget", CPP_SUBTARGET_SPEC },	\
diff --git a/gcc/configure b/gcc/configure
index bad96bf..2c25e19 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6265,6 +6265,9 @@ for machine in $build $host $target; do
 		;;
 	alpha*-*-*)
 		case $machine in
+			alphaev6[78]*)
+				target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
+				;;
 			alphaev6*)
 				target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
 				;;
diff --git a/gcc/configure.in b/gcc/configure.in
index 67da5aa..d332b26 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3587,6 +3587,9 @@ changequote([,])dnl
 		;;
 	alpha*-*-*)
 		case $machine in
+			alphaev6[78]*)
+				target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
+				;;
 			alphaev6*)
 				target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
 				;;