diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3173f0b2f2a..bfdf1cc39bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-04  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* stmt.c (expand_asm, expand_asm_operands): Make them static.
+	* tree.h: Remove the prototypes for expand_asm and
+	expand_asm_operands.
+
 2004-11-04  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* passes.c (rest_of_compilation): Make it static.
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 08dabdef1cf..d7f37a30f7b 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -260,7 +260,7 @@ n_occurrences (int c, const char *s)
    or an ADDR_EXPR containing a STRING_CST.  VOL nonzero means the
    insn is volatile; don't optimize it.  */
 
-void
+static void
 expand_asm (tree string, int vol)
 {
   rtx body;
@@ -611,7 +611,7 @@ decl_conflicts_with_clobbers_p (tree decl, const HARD_REG_SET clobbered_regs)
 
    VOL nonzero means the insn is volatile; don't optimize it.  */
 
-void
+static void
 expand_asm_operands (tree string, tree outputs, tree inputs,
 		     tree clobbers, int vol, location_t locus)
 {
diff --git a/gcc/tree.h b/gcc/tree.h
index 023811a23cb..0611c2809df 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3466,7 +3466,6 @@ extern void expand_expr_stmt_value (tree, int, int);
 extern int warn_if_unused_value (tree, location_t);
 extern void expand_label (tree);
 extern void expand_goto (tree);
-extern void expand_asm (tree, int);
 
 extern rtx expand_stack_save (void);
 extern void expand_stack_restore (tree);
@@ -3735,7 +3734,6 @@ extern bool parse_output_constraint (const char **, int, int, int,
 				     bool *, bool *, bool *);
 extern bool parse_input_constraint (const char **, int, int, int, int,
 				    const char * const *, bool *, bool *);
-extern void expand_asm_operands (tree, tree, tree, tree, int, location_t);
 extern void expand_asm_expr (tree);
 extern tree resolve_asm_operand_names (tree, tree, tree);
 extern void expand_case (tree);