diff --git a/ChangeLog b/ChangeLog
index 89225e2aab..3c99daa557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2000-07-25  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* sysdeps/mips/dl-machine.h (_RTLD_PROLOGUE): Stringify using
+	__STRING(entry) and not #entry.
+	(_RTLD_EPILOGUE): Likewise.
+	* sysdeps/mips/mips64/dl-machine.h: Likewise.
+
+2000-07-25  Andreas Jaeger  <aj@suse.de>
+
+	* stdio-common/Makefile ($(objpfx)tst-unbputc.out): Change parameter
+	according to changes in test program, run also with static only
+	builds.
+	($(objpfx)tst-printf.out): Likewise.
+
+	* stdio-common/tst-unbputc.sh: Likewise.
+	* stdio-common/tst-printf.sh: Likewise.
+
 2000-07-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* libio/wfileops.c (_IO_wdo_write): Correct return value.
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index e1b9163526..d1ac5ccfb7 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -37,13 +37,13 @@
 #define OFFSET_GP_GOT 0x7ff0
 
 #ifndef _RTLD_PROLOGUE
-# define _RTLD_PROLOGUE(entry) "\n\t.globl " #entry \
-			       "\n\t.ent " #entry \
-			       "\n\t" #entry ":\n\t"
+# define _RTLD_PROLOGUE(entry) "\n\t.globl " __STRING(entry)	\
+			       "\n\t.ent " __STRING(entry)	\
+			       "\n\t" __STRING(entry) ":\n\t"
 #endif
 
 #ifndef _RTLD_EPILOGUE
-# define _RTLD_EPILOGUE(entry) "\t.end " #entry "\n"
+# define _RTLD_EPILOGUE(entry) "\t.end " __STRING(entry) "\n"
 #endif
 
 /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries.
diff --git a/sysdeps/mips/mips64/dl-machine.h b/sysdeps/mips/mips64/dl-machine.h
index 024476b66b..195a1d3634 100644
--- a/sysdeps/mips/mips64/dl-machine.h
+++ b/sysdeps/mips/mips64/dl-machine.h
@@ -32,13 +32,13 @@
 #endif
 
 #ifndef _RTLD_PROLOGUE
-# define _RTLD_PROLOGUE(entry) "\n\t.globl " #entry \
-			      "\n\t.ent " #entry \
-			      "\n\t" #entry ":\n\t"
+# define _RTLD_PROLOGUE(entry) "\n\t.globl " __STRING(entry)	\
+			       "\n\t.ent " __STRING(entry)	\
+			       "\n\t" __STRING(entry) ":\n\t"
 #endif
 
 #ifndef _RTLD_EPILOGUE
-# define _RTLD_EPILOGUE(entry) "\t.end " #entry "\n"
+# define _RTLD_EPILOGUE(entry) "\t.end " __STRING(entry) "\n"
 #endif
 
 /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries.