diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d5cc7974308..f6dd8561597 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 25 12:54:57 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* tree.c (valid_machine_attribute): Don't apply attributes to both
+	decl and type.
+
 Tue Aug 25 12:23:20 PDT 1998  Richard Henderson  <rth@cygnus.com>
 
         * reload.c (operands_match_p): Handle rtvecs.
@@ -86,8 +91,6 @@ Mon Aug 24 00:53:53 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* fixinc.irix: Add curses.h handling from fixinc.wrap.
 
-Fri Aug 14 14:12:59 1998  Jason Merrill  <jason@yorick.cygnus.com>
-
 	* c-common.c (combine_strings): Also set TREE_READONLY.
 	Change warn_write_strings to flag_const_strings.
 	* c-decl.c, c-tree.h: Likewise.
diff --git a/gcc/tree.c b/gcc/tree.c
index 044be55e8cd..532dd1908a8 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -3376,7 +3376,10 @@ valid_machine_attribute (attr_name, attr_args, decl, type)
 #endif
 
 #ifdef VALID_MACHINE_TYPE_ATTRIBUTE
-  if (VALID_MACHINE_TYPE_ATTRIBUTE (type, type_attr_list, attr_name, attr_args))
+  if (valid)
+    /* Don't apply the attribute to both the decl and the type.  */;
+  else if (VALID_MACHINE_TYPE_ATTRIBUTE (type, type_attr_list, attr_name,
+					 attr_args))
     {
       tree attr = lookup_attribute (IDENTIFIER_POINTER (attr_name),
 				    type_attr_list);