diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f8c23501de..83c2d2914ce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-02  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
+
+	* config/c4x/c4x.c (c4x_function_arg): Check for void_type_node
+ 	before checking MUST_PASS_IN_STACK.
+
 2000-04-02  Neil Booth <NeilB@earthling.net>
 
 	* cppexp.c:  New FINISHED dummy token.  Combine operator initial
diff --git a/gcc/config/c4x/c4x.c b/gcc/config/c4x/c4x.c
index 3ee934c08b5..9972f472f68 100644
--- a/gcc/config/c4x/c4x.c
+++ b/gcc/config/c4x/c4x.c
@@ -603,6 +603,11 @@ c4x_function_arg (cum, mode, type, named)
       cum->init = 1;
     }
 
+  /* This marks the last argument.  We don't need to pass this through
+     to the call insn.  */
+  if (type == void_type_node)
+    return 0;
+
   if (! TARGET_MEMPARM 
       && named 
       && type
@@ -742,7 +747,8 @@ c4x_assembler_function_p ()
   tree type;
 
   type = TREE_TYPE (current_function_decl);
-  return lookup_attribute ("assembler", TYPE_ATTRIBUTES (type)) != NULL;
+  return (lookup_attribute ("assembler", TYPE_ATTRIBUTES (type)) != NULL)
+    || (lookup_attribute ("naked", TYPE_ATTRIBUTES (type)) != NULL);
 }