about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--sysdeps/mips/mips64/__longjmp.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 11336c026e..6e8548fcc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* sysdeps/mips/__longjmp.c (__longjmp): Change call to abort into
 	infinite loop to avoid pulling in stdio in the dynamic linker.
+	* sysdeps/mips/mips64/__longjmp.c (__longjmp): Likewise.
 
 2000-01-10  Andreas Jaeger  <aj@suse.de>
 
diff --git a/sysdeps/mips/mips64/__longjmp.c b/sysdeps/mips/mips64/__longjmp.c
index 551daa4895..28fef4720b 100644
--- a/sysdeps/mips/mips64/__longjmp.c
+++ b/sysdeps/mips/mips64/__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).
 
@@ -81,5 +81,6 @@ __longjmp (env, val_arg)
 
   asm volatile ("j $31");
 
-  abort ();
+  /* Avoid `volatile function does return' warnings.  */
+  for (;;);
 }