diff --git a/ChangeLog b/ChangeLog
index c931262070..4bec35b94c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-07-06  Ulrich Drepper  <drepper@cygnus.com>
 
+	* libio/oldtmpfile.c: Adjust call of __gen_tempname to match new
+	convention.
+
 	* sysdeps/unix/sysv/linux/alpha/ioperm.c: Update for some more
 	motherboards.
 	Patch by Jay Estabrook.
diff --git a/libio/oldtmpfile.c b/libio/oldtmpfile.c
index 40395bf9c2..002fad07a5 100644
--- a/libio/oldtmpfile.c
+++ b/libio/oldtmpfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 93, 96, 97, 98, 99 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ __old_tmpfile (void)
 
   if (__path_search (buf, FILENAME_MAX, NULL, "tmpf", 0))
     return NULL;
-  fd = __gen_tempname (buf, 1, 0);
+  fd = __gen_tempname (buf, __GT_FILE);
   if (fd < 0)
     return NULL;
 
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index b6530d18ae..64f2ce0638 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -152,9 +152,12 @@ fi
 # We need some extensions to the `ldd' script.
 
 case "$machine" in
-  i[3456]86* | m68* | sparc/sparc32)
+  i[3456]86* | m68*)
     ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed
     ;;
+  sparc/sparc32)
+    ldd_rewrite_script=../sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
+    ;;
   *)
     ;;
 esac
@@ -170,7 +173,7 @@ if test $host = $build; then
     ac_prefix=$ac_default_prefix
   fi
   echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
-echo "configure:174: checking for symlinks in ${ac_prefix}/include" >&5
+echo "configure:177: checking for symlinks in ${ac_prefix}/include" >&5
   ac_message=
   if test -L ${ac_prefix}/include/net; then
     ac_message="$ac_message