diff --git a/ChangeLog b/ChangeLog
index f79f4f2df2..4e22140f97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-07  Greg McGary  <greg@mcgary.org>
+
+	* sysdeps/unix/make-syscalls.sh: Tolerate syscalls that
+	have no names without leading underscores.
+
 2000-07-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* iconvdata/sjis.c (from_ucs4_lat1): Fix mappng of U005C and
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index 0bedf7a432..61da42153e 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -193,8 +193,8 @@ shared-only-routines += $file
   x-,-,* | x*,*.[sS],*V*) ;;
   x*,-,*$ptrlet* | x*,*.[sS],*$ptrlet*)
 
-    # find the name without leading underscores
-    set `echo $strong $weak |tr -s ' \t' '\12' |sed '/^_/d'`
+    # choose the name with the fewest leading underscores, preferably none
+    set `echo $strong $weak |tr ' \t' '\n' |sort -r`
     callname=$1
 
     # convert signature string to individual numbered arg names