diff --git a/ChangeLog b/ChangeLog
index 288596b805..11336c026e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-11  Andreas Schwab  <schwab@suse.de>
+
+	* sysdeps/mips/__longjmp.c (__longjmp): Change call to abort into
+	infinite loop to avoid pulling in stdio in the dynamic linker.
+
 2000-01-10  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/mips/dl-machine.h (elf_machine_matches_host): Follow
diff --git a/sysdeps/mips/__longjmp.c b/sysdeps/mips/__longjmp.c
index 9b4c1e14e0..e9ef5cff3d 100644
--- a/sysdeps/mips/__longjmp.c
+++ b/sysdeps/mips/__longjmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995, 1997, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
@@ -79,5 +79,6 @@ __longjmp (env, val_arg)
 
   asm volatile ("j $31");
 
-  abort ();
+  /* Avoid `volatile function does return' warnings.  */
+  for (;;);
 }