4 files changed, 7 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c
index 2f48dc2c9b..c4e24cf1e0 100644
--- a/sysdeps/unix/sysv/linux/i386/fxstat.c
+++ b/sysdeps/unix/sysv/linux/i386/fxstat.c
@@ -46,7 +46,9 @@ extern int __have_no_stat64;
 int
 __fxstat (int vers, int fd, struct stat *buf)
 {
+#if __ASSUME_STAT64_SYSCALL == 0
   struct kernel_stat kbuf;
+#endif
   int result;
 
   if (vers == _STAT_VER_KERNEL)
diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.c b/sysdeps/unix/sysv/linux/i386/lxstat.c
index f40bc2bc5f..ee89ec125a 100644
--- a/sysdeps/unix/sysv/linux/i386/lxstat.c
+++ b/sysdeps/unix/sysv/linux/i386/lxstat.c
@@ -47,7 +47,9 @@ extern int __have_no_stat64;
 int
 __lxstat (int vers, const char *name, struct stat *buf)
 {
+#if __ASSUME_STAT64_SYSCALL == 0
   struct kernel_stat kbuf;
+#endif
   int result;
 
   if (vers == _STAT_VER_KERNEL)
diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c
index 7dd83550de..7f71a11d0c 100644
--- a/sysdeps/unix/sysv/linux/i386/xstat.c
+++ b/sysdeps/unix/sysv/linux/i386/xstat.c
@@ -47,7 +47,9 @@ extern int __have_no_stat64;
 int
 __xstat (int vers, const char *name, struct stat *buf)
 {
+#if __ASSUME_STAT64_SYSCALL == 0
   struct kernel_stat kbuf;
+#endif
   int result;
 
   if (vers == _STAT_VER_KERNEL)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
index ad104f6e1e..77c0e2608e 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
@@ -32,7 +32,7 @@ shutdown	-	shutdown	2	__shutdown	shutdown
 socketpair	-	socketpair	4	__socketpair	socketpair
 
 getresuid	-	getresuid	3	getresuid
-getresgid	-	getresgid	3	getresuid
+getresgid	-	getresgid	3	getresgid
 
 # System calls with wrappers.
 rt_sigaction	-	rt_sigaction	4	__syscall_rt_sigaction