diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 07bdfd60685..69e63f35ec8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov  7 19:41:17 1999  Catherine Moore  <clm@cygnus.com>
+
+        * config/elfos.h (ASM_DECLARE_FUNCTION_NAME): Conditionally define.
+        (ASM_DECLARE_FUNCTION_SIZE): Conditionally define.
+
 Sun Nov  7 10:23:28 1999  Mark P. Mitchell  <mark@codesourcery.com>
 
 	* integrate.c (save_for_inline_nocopy): Clear in_nonparm_insns.
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index ad88b1e326c..fbb111a9431 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -489,6 +489,7 @@ do {								\
    Some svr4 assemblers need to also have something extra said about the
    function's return value.  We allow for that here.  */
 
+#ifndef ASM_DECLARE_FUNCTION_NAME
 #define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)			\
   do {									\
     fprintf (FILE, "\t%s\t ", TYPE_ASM_OP);				\
@@ -499,7 +500,7 @@ do {								\
     ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL));			\
     ASM_OUTPUT_LABEL(FILE, NAME);					\
   } while (0)
-
+#endif
 /* Write the extra assembler code needed to declare an object properly.  */
 
 #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)			\
@@ -542,7 +543,7 @@ do {									 \
    } while (0)
 
 /* This is how to declare the size of a function.  */
-
+#ifndef ASM_DECLARE_FUNCTION_SIZE
 #define ASM_DECLARE_FUNCTION_SIZE(FILE, FNAME, DECL)			\
   do {									\
     if (!flag_inhibit_size_directive)					\
@@ -561,6 +562,7 @@ do {									 \
 	putc ('\n', FILE);						\
       }									\
   } while (0)
+#endif
 
 /* A table of bytes codes used by the ASM_OUTPUT_ASCII and
    ASM_OUTPUT_LIMITED_STRING macros.  Each byte in the table