diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6c768aa097..4f6f109f219 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -4,6 +4,10 @@ Thu May 27 02:40:48 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 Thu May 27 02:09:27 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* varasm.c (STRIP_NAME_ENCODING): Remove default definition.
+	* output.h (STRIP_NAME_ENCODING): Strip '*' like the old varasm
+	version did.
+
 	* reload.c (push_reload): Do not call remove_address_replacements
 	when presented with identical optional reloads.
 
diff --git a/gcc/output.h b/gcc/output.h
index 9456ed8ed3f..85310850737 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -506,8 +506,10 @@ extern FILE *rtl_dump_file;
 /* User label prefix in effect for this compilation.  */
 extern const char *user_label_prefix;
 
-/* Define a default version of STRIP_NAME_ENCODING so that we can use
-   it without a mess of #ifdefs.  */
+/* This macro gets just the user-specified name
+   out of the string in a SYMBOL_REF.  On most machines,
+   we discard the * if any and that's all.  */
 #ifndef STRIP_NAME_ENCODING
-#define STRIP_NAME_ENCODING(TARGET,SOURCE)  (TARGET = SOURCE)
+#define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME) \
+  (VAR) = ((SYMBOL_NAME) + ((SYMBOL_NAME)[0] == '*'))
 #endif
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 4f922905325..c6f15b8115f 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -72,14 +72,6 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #define CHKR_PREFIX_SIZE (sizeof (CHKR_PREFIX) - 1)
 
-/* This macro gets just the user-specified name
-   out of the string in a SYMBOL_REF.  On most machines,
-   we discard the * if any and that's all.  */
-#ifndef STRIP_NAME_ENCODING
-#define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME) \
-  (VAR) = ((SYMBOL_NAME) + ((SYMBOL_NAME)[0] == '*'))
-#endif
-
 /* File in which assembler code is being written.  */
 
 extern FILE *asm_out_file;