diff options
| -rw-r--r-- | libexec/ld.so/alpha/ldasm.S | 8 | ||||
| -rw-r--r-- | libexec/ld.so/alpha/syscall.h | 3 | ||||
| -rw-r--r-- | libexec/ld.so/amd64/ldasm.S | 3 | ||||
| -rw-r--r-- | libexec/ld.so/amd64/syscall.h | 3 | ||||
| -rw-r--r-- | libexec/ld.so/arm/ldasm.S | 3 | ||||
| -rw-r--r-- | libexec/ld.so/arm/syscall.h | 3 | ||||
| -rw-r--r-- | libexec/ld.so/hppa/ldasm.S | 8 | ||||
| -rw-r--r-- | libexec/ld.so/hppa/syscall.h | 3 | ||||
| -rw-r--r-- | libexec/ld.so/i386/ldasm.S | 3 | ||||
| -rw-r--r-- | libexec/ld.so/i386/syscall.h | 3 | ||||
| -rw-r--r-- | libexec/ld.so/mips64/syscall.h | 19 | ||||
| -rw-r--r-- | libexec/ld.so/powerpc/syscall.h | 22 | ||||
| -rw-r--r-- | libexec/ld.so/sh/ldasm.S | 3 | ||||
| -rw-r--r-- | libexec/ld.so/sh/syscall.h | 3 | ||||
| -rw-r--r-- | libexec/ld.so/sparc/ldasm.S | 14 | ||||
| -rw-r--r-- | libexec/ld.so/sparc/syscall.h | 3 | ||||
| -rw-r--r-- | libexec/ld.so/sparc64/ldasm.S | 9 | ||||
| -rw-r--r-- | libexec/ld.so/sparc64/syscall.h | 3 |
18 files changed, 18 insertions, 98 deletions
diff --git a/libexec/ld.so/alpha/ldasm.S b/libexec/ld.so/alpha/ldasm.S index 7de78da3fd0..0806b4312e9 100644 --- a/libexec/ld.so/alpha/ldasm.S +++ b/libexec/ld.so/alpha/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.17 2006/05/03 16:10:51 drahn Exp $ */ +/* $OpenBSD: ldasm.S,v 1.18 2012/10/24 03:26:55 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -258,12 +258,6 @@ LEAF_NOPROFILE(_dl_issetugid, 0) RET END(_dl_issetugid) -LEAF_NOPROFILE(_dl_stat, 2) - ldiq v0, SYS_stat - call_pal PAL_OSF1_callsys - RET -END(_dl_stat) - LEAF_NOPROFILE(_dl__syscall, 3) ldiq v0, SYS___syscall call_pal PAL_OSF1_callsys diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h index fb1f34b4ae1..d7699c9449e 100644 --- a/libexec/ld.so/alpha/syscall.h +++ b/libexec/ld.so/alpha/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.17 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.18 2012/10/24 03:26:55 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -46,7 +46,6 @@ int _dl_mprotect(const void *, size_t, int); int _dl_munmap(const void*, size_t); int _dl_open(const char*, int); ssize_t _dl_read(int, const char*, size_t); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); diff --git a/libexec/ld.so/amd64/ldasm.S b/libexec/ld.so/amd64/ldasm.S index 19fd5018fc9..ec3d77b696f 100644 --- a/libexec/ld.so/amd64/ldasm.S +++ b/libexec/ld.so/amd64/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.9 2012/10/22 21:14:59 kettenis Exp $ */ +/* $OpenBSD: ldasm.S,v 1.10 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2002,2004 Dale Rahn @@ -86,7 +86,6 @@ __CONCAT(_dl_,n): ;\ DL_SYSCALL(open) DL_SYSCALL(fcntl) DL_SYSCALL(fstat) -DL_SYSCALL(stat) DL_SYSCALL(read) DL_SYSCALL(write) DL_SYSCALL(close) diff --git a/libexec/ld.so/amd64/syscall.h b/libexec/ld.so/amd64/syscall.h index 30b064f7c7c..b96dc87f530 100644 --- a/libexec/ld.so/amd64/syscall.h +++ b/libexec/ld.so/amd64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.5 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.6 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -47,7 +47,6 @@ int _dl_mprotect(const void *, int, int); int _dl_munmap(const void *, unsigned int); int _dl_open(const char *, unsigned int); int _dl_read(int, const char *, int); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); diff --git a/libexec/ld.so/arm/ldasm.S b/libexec/ld.so/arm/ldasm.S index 6ac18075b04..e80df41bf6e 100644 --- a/libexec/ld.so/arm/ldasm.S +++ b/libexec/ld.so/arm/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.6 2006/05/03 16:10:52 drahn Exp $ */ +/* $OpenBSD: ldasm.S,v 1.7 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2004 Dale Rahn @@ -109,7 +109,6 @@ DL_SYSCALL(mprotect) DL_SYSCALL(open) DL_SYSCALL(read) DL_SYSCALL(write) -DL_SYSCALL(stat) DL_SYSCALL(fstat) DL_SYSCALL(fcntl) DL_SYSCALL(gettimeofday) diff --git a/libexec/ld.so/arm/syscall.h b/libexec/ld.so/arm/syscall.h index 16a8cdfd0f9..27347f7e992 100644 --- a/libexec/ld.so/arm/syscall.h +++ b/libexec/ld.so/arm/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.5 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.6 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -47,7 +47,6 @@ int _dl_mprotect(const void *, int, int); int _dl_munmap(const void *, unsigned int); int _dl_open(const char *, unsigned int); int _dl_read(int, const char *, int); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); diff --git a/libexec/ld.so/hppa/ldasm.S b/libexec/ld.so/hppa/ldasm.S index 87eb024ac6d..e62d306d529 100644 --- a/libexec/ld.so/hppa/ldasm.S +++ b/libexec/ld.so/hppa/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.6 2010/02/01 21:36:00 kettenis Exp $ */ +/* $OpenBSD: ldasm.S,v 1.7 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -234,12 +234,6 @@ ENTRY(_dl_write,0) nop EXIT(_dl_write) -ENTRY(_dl_stat,0) - SYSCALL(stat) - bv r0(rp) - nop -EXIT(_dl_stat) - ENTRY(_dl_fstat,0) SYSCALL(fstat) bv r0(rp) diff --git a/libexec/ld.so/hppa/syscall.h b/libexec/ld.so/hppa/syscall.h index 30b064f7c7c..b96dc87f530 100644 --- a/libexec/ld.so/hppa/syscall.h +++ b/libexec/ld.so/hppa/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.5 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.6 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -47,7 +47,6 @@ int _dl_mprotect(const void *, int, int); int _dl_munmap(const void *, unsigned int); int _dl_open(const char *, unsigned int); int _dl_read(int, const char *, int); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); diff --git a/libexec/ld.so/i386/ldasm.S b/libexec/ld.so/i386/ldasm.S index 2052a03e38d..dac6d208c87 100644 --- a/libexec/ld.so/i386/ldasm.S +++ b/libexec/ld.so/i386/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.11 2009/02/16 14:17:51 kurt Exp $ */ +/* $OpenBSD: ldasm.S,v 1.12 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -114,7 +114,6 @@ DL_SYSCALL(mprotect) DL_SYSCALL(open) DL_SYSCALL(read) DL_SYSCALL(write) -DL_SYSCALL(stat) DL_SYSCALL(fstat) DL_SYSCALL(fcntl) DL_SYSCALL(gettimeofday) diff --git a/libexec/ld.so/i386/syscall.h b/libexec/ld.so/i386/syscall.h index 8cda775d229..9629dcb311b 100644 --- a/libexec/ld.so/i386/syscall.h +++ b/libexec/ld.so/i386/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.9 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.10 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -47,7 +47,6 @@ int _dl_mprotect(const void *, int, int); int _dl_munmap(const void *, unsigned int); int _dl_open(const char *, unsigned int); int _dl_read(int, const char *, int); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); diff --git a/libexec/ld.so/mips64/syscall.h b/libexec/ld.so/mips64/syscall.h index 0ed21cf81a2..51128092656 100644 --- a/libexec/ld.so/mips64/syscall.h +++ b/libexec/ld.so/mips64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.7 2012/08/17 14:32:46 matthew Exp $ */ +/* $OpenBSD: syscall.h,v 1.8 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 1998-2002 Opsycon AB, Sweden. @@ -189,23 +189,6 @@ _dl_mprotect(const void *addr, size_t size, int prot) } extern inline int -_dl_stat(const char *addr, struct stat *sb) -{ - register int status __asm__ ("$2"); - - __asm__ volatile ( - "move $4,%2\n\t" - "move $5,%3\n\t" - "li $2,%1\n\t" - "syscall" - : "=r" (status) - : "I" (SYS_stat), "r" (addr), "r" (sb) - : "memory", "$3", "$4", "$5", "$6", "$7", "$8", "$9", - "$10","$11","$12","$13","$14","$15","$24","$25"); - return status; -} - -extern inline int _dl_fstat(const int fd, struct stat *sb) { register int status __asm__ ("$2"); diff --git a/libexec/ld.so/powerpc/syscall.h b/libexec/ld.so/powerpc/syscall.h index d95e8b9f240..4d7b4bc16f9 100644 --- a/libexec/ld.so/powerpc/syscall.h +++ b/libexec/ld.so/powerpc/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.23 2012/08/17 14:32:46 matthew Exp $ */ +/* $OpenBSD: syscall.h,v 1.24 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -197,26 +197,6 @@ _dl_mprotect(const void *addr, size_t size, int prot) } static inline int -_dl_stat(const char *addr, struct stat *sb) -{ - register int status; - - __asm__ volatile ("li 0,%1\n\t" - "mr 3,%2\n\t" - "mr 4,%3\n\t" - "sc\n\t" - "cmpwi 0, 0\n\t" - "beq 1f\n\t" - "li 3,-1\n\t" - "1:" - "mr %0,3\n\t" - : "=r" (status) - : "I" (SYS_stat), "r" (addr), "r" (sb) - : "memory", "0", "3", "4"); - return status; -} - -static inline int _dl_fstat(int fd, struct stat *sb) { register int status; diff --git a/libexec/ld.so/sh/ldasm.S b/libexec/ld.so/sh/ldasm.S index 61833ccff3f..dea82277e77 100644 --- a/libexec/ld.so/sh/ldasm.S +++ b/libexec/ld.so/sh/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.7 2006/11/14 19:47:50 drahn Exp $ */ +/* $OpenBSD: ldasm.S,v 1.8 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2006 Dale Rahn @@ -192,7 +192,6 @@ DL_SYSCALL(read) nop DL_SYSCALL(write) -DL_SYSCALL(stat) DL_SYSCALL(fstat) DL_SYSCALL(fcntl) DL_SYSCALL(gettimeofday) diff --git a/libexec/ld.so/sh/syscall.h b/libexec/ld.so/sh/syscall.h index c51077df662..fddd0a820dd 100644 --- a/libexec/ld.so/sh/syscall.h +++ b/libexec/ld.so/sh/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.3 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.4 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -47,7 +47,6 @@ int _dl_mprotect(const void *, int, int); int _dl_munmap(const void *, unsigned int); int _dl_open(const char *, unsigned int); int _dl_read(int, const char *, int); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); diff --git a/libexec/ld.so/sparc/ldasm.S b/libexec/ld.so/sparc/ldasm.S index 1a39080cdf3..028b07dc5a3 100644 --- a/libexec/ld.so/sparc/ldasm.S +++ b/libexec/ld.so/sparc/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.17 2012/10/22 17:28:27 kettenis Exp $ */ +/* $OpenBSD: ldasm.S,v 1.18 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -243,18 +243,6 @@ _dl_write: .section ".text" .align 4 - .global _dl_stat - .type _dl_stat,@function -_dl_stat: - mov SYS_stat | SYSCALL_G2RFLAG, %g1 ! call sys_stat - 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 .globl _dl_fstat .type _dl_fstat,@function _dl_fstat: diff --git a/libexec/ld.so/sparc/syscall.h b/libexec/ld.so/sparc/syscall.h index 5b92e9256a5..9335fe2c6c5 100644 --- a/libexec/ld.so/sparc/syscall.h +++ b/libexec/ld.so/sparc/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.10 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.11 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -47,7 +47,6 @@ int _dl_mprotect(const void *, int, int); int _dl_munmap(const void*, unsigned int); int _dl_open(const char*, unsigned int); int _dl_read(int, const char*, int); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); diff --git a/libexec/ld.so/sparc64/ldasm.S b/libexec/ld.so/sparc64/ldasm.S index d1d808928d0..f23719ea789 100644 --- a/libexec/ld.so/sparc64/ldasm.S +++ b/libexec/ld.so/sparc64/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.28 2012/10/22 17:27:19 kettenis Exp $ */ +/* $OpenBSD: ldasm.S,v 1.29 2012/10/24 03:26:56 guenther Exp $ */ /* $NetBSD: rtld_start.S,v 1.5 2001/08/14 22:17:48 eeh Exp $ */ /* @@ -267,13 +267,6 @@ _ENTRY(_dl_write) retl sub %g0, %o0, %o0 ! error: result = -errno -_ENTRY(_dl_stat) - mov SYS_stat | SYSCALL_G2RFLAG, %g1 ! call sys_stat - add %o7, 8, %g2 ! just return on success - t ST_SYSCALL ! off to wonderland - retl - sub %g0, %o0, %o0 ! error: result = -errno - _ENTRY(_dl_fstat) mov SYS_fstat | SYSCALL_G2RFLAG, %g1 ! call sys_fstat 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 b6104194d2b..91240a4a5f1 100644 --- a/libexec/ld.so/sparc64/syscall.h +++ b/libexec/ld.so/sparc64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.17 2010/10/28 15:02:41 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.18 2012/10/24 03:26:56 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -47,7 +47,6 @@ int _dl_mprotect(const void *, size_t, int); int _dl_munmap(const void*, size_t); int _dl_open(const char*, int); ssize_t _dl_read(int, const char*, size_t); -int _dl_stat(const char *, struct stat *); int _dl_fstat(int, struct stat *); int _dl_fcntl(int, int, ...); int _dl_getdirentries(int, char*, int, off_t *); |
