From 96d30987f33afba7e5ebf423b5cfac6466768b82 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Sun, 28 Aug 2016 06:15:32 +0000
Subject: [PATCH] ld.so doesn't need gettimeofday or lstat stubs any more

ok deraadt@
---
 libexec/ld.so/alpha/ldasm.S     |  4 +---
 libexec/ld.so/alpha/syscall.h   |  4 +---
 libexec/ld.so/amd64/ldasm.S     |  4 +---
 libexec/ld.so/amd64/syscall.h   |  4 +---
 libexec/ld.so/arm/ldasm.S       |  4 +---
 libexec/ld.so/arm/syscall.h     |  4 +---
 libexec/ld.so/hppa/ldasm.S      | 14 +-------------
 libexec/ld.so/hppa/syscall.h    |  4 +---
 libexec/ld.so/i386/ldasm.S      |  4 +---
 libexec/ld.so/i386/syscall.h    |  4 +---
 libexec/ld.so/m88k/ldasm.S      |  4 +---
 libexec/ld.so/m88k/syscall.h    |  4 +---
 libexec/ld.so/mips64/ldasm.S    |  4 +---
 libexec/ld.so/mips64/syscall.h  |  4 +---
 libexec/ld.so/powerpc/ldasm.S   |  4 +---
 libexec/ld.so/powerpc/syscall.h |  4 +---
 libexec/ld.so/sh/ldasm.S        |  4 +---
 libexec/ld.so/sh/syscall.h      |  4 +---
 libexec/ld.so/sparc/ldasm.S     | 26 +-------------------------
 libexec/ld.so/sparc/syscall.h   |  4 +---
 libexec/ld.so/sparc64/ldasm.S   | 16 +---------------
 libexec/ld.so/sparc64/syscall.h |  4 +---
 22 files changed, 22 insertions(+), 110 deletions(-)

diff --git a/libexec/ld.so/alpha/ldasm.S b/libexec/ld.so/alpha/ldasm.S
index 661dc25789e..33f28287079 100644
--- a/libexec/ld.so/alpha/ldasm.S
+++ b/libexec/ld.so/alpha/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.36 2016/08/07 03:05:23 guenther Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.37 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -316,10 +316,8 @@ DL_SYSCALL(getdents)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
 DL_SYSCALL(pledge)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL_NOERR(issetugid)
 DL_SYSCALL_NOERR(getthrid)
-DL_SYSCALL(lstat)
 DL_SYSCALL(mprotect)
 DL_SYSCALL(munmap)
 DL_SYSCALL(open)
diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index 562db2e718f..2687475e115 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.34 2016/07/04 21:15:06 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.35 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 long	_dl__syscall(quad_t, ...);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/amd64/ldasm.S b/libexec/ld.so/amd64/ldasm.S
index 922c1b8aea2..76a1945733e 100644
--- a/libexec/ld.so/amd64/ldasm.S
+++ b/libexec/ld.so/amd64/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.24 2016/05/07 19:05:23 guenther Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.25 2016/08/28 06:15:32 guenther Exp $	*/
 
 /*
  * Copyright (c) 2002,2004 Dale Rahn
@@ -91,10 +91,8 @@ DL_SYSCALL(getthrid)
 DL_SYSCALL(getdents)
 DL_SYSCALL(mprotect)
 DL_SYSCALL(munmap)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL(exit)
 DL_SYSCALL(readlink)
-DL_SYSCALL(lstat)
 DL_SYSCALL(utrace)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
diff --git a/libexec/ld.so/amd64/syscall.h b/libexec/ld.so/amd64/syscall.h
index b64012d817d..a19798aa77d 100644
--- a/libexec/ld.so/amd64/syscall.h
+++ b/libexec/ld.so/amd64/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.22 2016/07/04 21:15:06 guenther Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.23 2016/08/28 06:15:32 guenther Exp $	*/
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/arm/ldasm.S b/libexec/ld.so/arm/ldasm.S
index 04e445b6ac1..90e1acaf7c2 100644
--- a/libexec/ld.so/arm/ldasm.S
+++ b/libexec/ld.so/arm/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.23 2016/08/09 03:58:35 guenther Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.24 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2004 Dale Rahn
@@ -126,9 +126,7 @@ DL_SYSCALL(open)
 DL_SYSCALL(read)
 DL_SYSCALL(write)
 DL_SYSCALL(fstat)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL(readlink)
-DL_SYSCALL(lstat)
 DL_SYSCALL(utrace)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
diff --git a/libexec/ld.so/arm/syscall.h b/libexec/ld.so/arm/syscall.h
index 24321b86117..330fdbccbb8 100644
--- a/libexec/ld.so/arm/syscall.h
+++ b/libexec/ld.so/arm/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.22 2016/07/04 21:15:06 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.23 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/hppa/ldasm.S b/libexec/ld.so/hppa/ldasm.S
index 1663eb65f04..967d95cf6e0 100644
--- a/libexec/ld.so/hppa/ldasm.S
+++ b/libexec/ld.so/hppa/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.21 2016/05/07 19:05:23 guenther Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.22 2016/08/28 06:15:32 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004 Michael Shalayeff
@@ -242,24 +242,12 @@ ENTRY(_dl_getdents,0)
 	nop
 EXIT(_dl_getdents)
 
-ENTRY(_dl_gettimeofday,0)
-	SYSCALL(gettimeofday)
-	bv	r0(rp)
-	nop
-EXIT(_dl_gettimeofday)
-
 ENTRY(_dl_readlink,0)
 	SYSCALL(readlink)
 	bv	r0(rp)
 	nop
 EXIT(_dl_readlink)
 
-ENTRY(_dl_lstat,0)
-	SYSCALL(lstat)
-	bv	r0(rp)
-	nop
-EXIT(_dl_lstat)
-
 ENTRY(_dl_getcwd,0)
 	SYSCALL(__getcwd)
 	bv	r0(rp)
diff --git a/libexec/ld.so/hppa/syscall.h b/libexec/ld.so/hppa/syscall.h
index b64012d817d..a19798aa77d 100644
--- a/libexec/ld.so/hppa/syscall.h
+++ b/libexec/ld.so/hppa/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.22 2016/07/04 21:15:06 guenther Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.23 2016/08/28 06:15:32 guenther Exp $	*/
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/i386/ldasm.S b/libexec/ld.so/i386/ldasm.S
index 2476e1c73ca..28b074dd1ce 100644
--- a/libexec/ld.so/i386/ldasm.S
+++ b/libexec/ld.so/i386/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.27 2016/08/07 03:03:44 guenther Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.28 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -118,9 +118,7 @@ DL_SYSCALL(open)
 DL_SYSCALL(read)
 DL_SYSCALL(write)
 DL_SYSCALL(fstat)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL(readlink)
-DL_SYSCALL(lstat)
 DL_SYSCALL(utrace)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
diff --git a/libexec/ld.so/i386/syscall.h b/libexec/ld.so/i386/syscall.h
index 6d423ca3020..dacac9c20cb 100644
--- a/libexec/ld.so/i386/syscall.h
+++ b/libexec/ld.so/i386/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.26 2016/07/04 21:15:06 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.27 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/m88k/ldasm.S b/libexec/ld.so/m88k/ldasm.S
index aff65751b54..8293c8812a8 100644
--- a/libexec/ld.so/m88k/ldasm.S
+++ b/libexec/ld.so/m88k/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.22 2016/07/18 08:43:16 guenther Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.23 2016/08/28 06:15:32 guenther Exp $	*/
 
 /*
  * Copyright (c) 2013 Miodrag Vallat.
@@ -182,9 +182,7 @@ DL_SYSCALL(open)
 DL_SYSCALL(read)
 DL_SYSCALL(write)
 DL_SYSCALL(fstat)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL(readlink)
-DL_SYSCALL(lstat)
 DL_SYSCALL(utrace)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
diff --git a/libexec/ld.so/m88k/syscall.h b/libexec/ld.so/m88k/syscall.h
index 43a3b6b4727..885413b87f6 100644
--- a/libexec/ld.so/m88k/syscall.h
+++ b/libexec/ld.so/m88k/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.18 2016/07/04 21:15:06 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.19 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/mips64/ldasm.S b/libexec/ld.so/mips64/ldasm.S
index fa5e9eb7b58..d3d275bbc2b 100644
--- a/libexec/ld.so/mips64/ldasm.S
+++ b/libexec/ld.so/mips64/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.20 2016/08/07 03:01:53 guenther Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.21 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 1998-2002 Opsycon AB, Sweden.
@@ -156,10 +156,8 @@ DL_SYSCALL(getdents)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
 DL_SYSCALL(pledge)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL_NOERR(issetugid)
 DL_SYSCALL_NOERR(getthrid)
-DL_SYSCALL(lstat)
 DL_SYSCALL(mprotect)
 DL_SYSCALL(munmap)
 DL_SYSCALL(open)
diff --git a/libexec/ld.so/mips64/syscall.h b/libexec/ld.so/mips64/syscall.h
index 20727d99028..f2e83fab26d 100644
--- a/libexec/ld.so/mips64/syscall.h
+++ b/libexec/ld.so/mips64/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.24 2016/07/04 21:15:07 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.25 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 1998-2002 Opsycon AB, Sweden.
@@ -43,10 +43,8 @@ int	_dl_exit(int);
 int	_dl_fstat(int, struct stat *);
 int	_dl_getcwd(char *, size_t);
 ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
diff --git a/libexec/ld.so/powerpc/ldasm.S b/libexec/ld.so/powerpc/ldasm.S
index 1ad7d009259..93a03bac12b 100644
--- a/libexec/ld.so/powerpc/ldasm.S
+++ b/libexec/ld.so/powerpc/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.29 2016/05/07 19:05:23 guenther Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.30 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -149,10 +149,8 @@ DL_SYSCALL(getdents)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
 DL_SYSCALL(pledge)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL_NOERR(issetugid)
 DL_SYSCALL_NOERR(getthrid)
-DL_SYSCALL(lstat)
 DL_SYSCALL(mmap)
 DL_SYSCALL(mprotect)
 DL_SYSCALL(munmap)
diff --git a/libexec/ld.so/powerpc/syscall.h b/libexec/ld.so/powerpc/syscall.h
index aa927445622..156d276058b 100644
--- a/libexec/ld.so/powerpc/syscall.h
+++ b/libexec/ld.so/powerpc/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.42 2016/07/04 21:15:07 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.43 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -43,10 +43,8 @@ void	_dl_exit(int);
 int	_dl_fstat(int, struct stat *);
 int	_dl_getcwd(char *, size_t);
 ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-int	_dl_lstat(const char *, struct stat *);
 void *	_dl_mmap(void *, size_t, int, int, int, off_t);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
diff --git a/libexec/ld.so/sh/ldasm.S b/libexec/ld.so/sh/ldasm.S
index a47984ceaa0..e23ccd66e5b 100644
--- a/libexec/ld.so/sh/ldasm.S
+++ b/libexec/ld.so/sh/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.25 2016/05/07 21:20:11 guenther Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.26 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Dale Rahn
@@ -186,9 +186,7 @@ DL_SYSCALL(read)
 
 DL_SYSCALL(write)
 DL_SYSCALL(fstat)
-DL_SYSCALL(gettimeofday)
 DL_SYSCALL(readlink)
-DL_SYSCALL(lstat)
 DL_SYSCALL(utrace)
 DL_SYSCALL(getentropy)
 DL_SYSCALL(sendsyslog)
diff --git a/libexec/ld.so/sh/syscall.h b/libexec/ld.so/sh/syscall.h
index 3b02caa2423..d42a1d7ad08 100644
--- a/libexec/ld.so/sh/syscall.h
+++ b/libexec/ld.so/sh/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.20 2016/07/04 21:15:07 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.21 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/sparc/ldasm.S b/libexec/ld.so/sparc/ldasm.S
index 0d5788bb01c..83a6cccf469 100644
--- a/libexec/ld.so/sparc/ldasm.S
+++ b/libexec/ld.so/sparc/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.31 2016/05/07 19:05:23 guenther Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.32 2016/08/28 06:15:32 guenther Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -294,18 +294,6 @@ _dl_sysctl:
 	 sub %g0, %o0, %o0				! error: result = -errno
 
 
-	.section ".text"
-	.align 4
-	.global _dl_gettimeofday
-	.type _dl_gettimeofday,@function
-_dl_gettimeofday:
-	mov SYS_gettimeofday | SYSCALL_G2RFLAG, %g1	! calling sys_gettimeofday
-	add %o7, 8, %g2				! just return on success
-	t ST_SYSCALL				! off to wonderland
-	retl
-	 sub %g0, %o0, %o0			! error: result = -errno
-
-
 	.section ".text"
 	.align 4
 	.global _dl_readlink
@@ -318,18 +306,6 @@ _dl_readlink:
 	 sub %g0, %o0, %o0			! error: result = -errno
 
 
-	.section ".text"
-	.align 4
-	.global _dl_lstat
-	.type _dl_lstat,@function
-_dl_lstat:
-	mov SYS_lstat | SYSCALL_G2RFLAG, %g1	! calling sys_lstat
-	add %o7, 8, %g2				! just return on success
-	t ST_SYSCALL				! off to wonderland
-	retl
-	 sub %g0, %o0, %o0			! error: result = -errno
-
-
 	.section ".text"
 	.align 4
 	.global _dl_getcwd
diff --git a/libexec/ld.so/sparc/syscall.h b/libexec/ld.so/sparc/syscall.h
index 87515b784b6..19016cc7d0e 100644
--- a/libexec/ld.so/sparc/syscall.h
+++ b/libexec/ld.so/sparc/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.27 2016/07/04 21:15:07 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.28 2016/08/28 06:15:32 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
diff --git a/libexec/ld.so/sparc64/ldasm.S b/libexec/ld.so/sparc64/ldasm.S
index d0f6aa7b2c5..31239a93ccd 100644
--- a/libexec/ld.so/sparc64/ldasm.S
+++ b/libexec/ld.so/sparc64/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.43 2016/05/07 19:05:23 guenther Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.44 2016/08/28 06:15:33 guenther Exp $	*/
 /*	$NetBSD: rtld_start.S,v 1.5 2001/08/14 22:17:48 eeh Exp $	*/
 
 /*
@@ -300,13 +300,6 @@ _ENTRY(_dl_sysctl)
 	retl
 	 sub %g0, %o0, %o0				! error: result = -errno
 
-_ENTRY(_dl_gettimeofday)
-	mov SYS_gettimeofday | SYSCALL_G2RFLAG, %g1	! calling sys_gettimeofday
-	add %o7, 8, %g2				! just return on success
-	t ST_SYSCALL				! off to wonderland
-	retl
-	 sub %g0, %o0, %o0			! error: result = -errno
-
 _ENTRY(_dl_readlink)
 	mov SYS_readlink | SYSCALL_G2RFLAG, %g1	! calling sys_readlink
 	add %o7, 8, %g2				! just return on success
@@ -314,13 +307,6 @@ _ENTRY(_dl_readlink)
 	retl
 	 sub %g0, %o0, %o0			! error: result = -errno
 
-_ENTRY(_dl_lstat)
-	mov SYS_lstat | SYSCALL_G2RFLAG, %g1	! calling sys_lstat
-	add %o7, 8, %g2				! just return on success
-	t ST_SYSCALL				! off to wonderland
-	retl
-	 sub %g0, %o0, %o0			! error: result = -errno
-
 _ENTRY(_dl_getcwd)
 	mov SYS___getcwd | SYSCALL_G2RFLAG, %g1	! calling sys___getcwd
 	add %o7, 8, %g2				! just return on success
diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h
index 7507dd1d662..07def710309 100644
--- a/libexec/ld.so/sparc64/syscall.h
+++ b/libexec/ld.so/sparc64/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.34 2016/07/04 21:15:07 guenther Exp $ */
+/*	$OpenBSD: syscall.h,v 1.35 2016/08/28 06:15:33 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -51,10 +51,8 @@ ssize_t	_dl_read(int, const char *, size_t);
 int	_dl_fstat(int, struct stat *);
 ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int	_dl_gettimeofday(struct timeval *, struct timezone *);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl_lstat(const char *, struct stat *);
 int	_dl_getcwd(char *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
-- 
2.20.1