diff options
author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-08-26 01:54:10 +0000 |
---|---|---|
committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-08-26 01:54:10 +0000 |
commit | 198876b2957c4927bee119d959edcf90dca5326c (patch) | |
tree | 4a831d17b19abcb97599a52fc3557d96e9aef824 /lib/libc/arch/arm | |
parent | ac2a6151bdd6d28dc4f8c26284cc08a9d15466dd (diff) |
Hide many (194!) symbols that nothing should be using.
Delete exect(2); it wasn't portable across archs and nothing used it.
ports test build by naddy@
ok deraadt@ kettenis@
Diffstat (limited to 'lib/libc/arch/arm')
-rw-r--r-- | lib/libc/arch/arm/SYS.h | 3 | ||||
-rw-r--r-- | lib/libc/arch/arm/Symbols.list | 8 | ||||
-rw-r--r-- | lib/libc/arch/arm/sys/brk.S | 17 | ||||
-rw-r--r-- | lib/libc/arch/arm/sys/exect.S | 37 | ||||
-rw-r--r-- | lib/libc/arch/arm/sys/sbrk.S | 17 |
5 files changed, 14 insertions, 68 deletions
diff --git a/lib/libc/arch/arm/SYS.h b/lib/libc/arch/arm/SYS.h index 2fb7c3a91ba..ce42349711a 100644 --- a/lib/libc/arch/arm/SYS.h +++ b/lib/libc/arch/arm/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.9 2015/04/07 01:27:06 guenther Exp $ */ +/* $OpenBSD: SYS.h,v 1.10 2015/08/26 01:54:09 guenther Exp $ */ /* $NetBSD: SYS.h,v 1.8 2003/08/07 16:42:02 agc Exp $ */ /*- @@ -51,7 +51,6 @@ #define CERROR _C_LABEL(__cerror) #define _CERROR _C_LABEL(___cerror) -#define CURBRK _C_LABEL(__curbrk) #define _SYSCALL_NOERROR(x,y) \ SYSENTRY(x); \ diff --git a/lib/libc/arch/arm/Symbols.list b/lib/libc/arch/arm/Symbols.list index a2d20b24787..6a3b0adb18a 100644 --- a/lib/libc/arch/arm/Symbols.list +++ b/lib/libc/arch/arm/Symbols.list @@ -30,7 +30,6 @@ __lesf2 __ltdf2 __ltsf2 __mcount -__minbrk __modsi3 __muldf3 __mulsf3 @@ -45,7 +44,6 @@ __udivsi3 __umodsi3 __unorddf2 __unordsf2 -_brk _bss_end__ _fpgetmask _fpgetround @@ -55,7 +53,6 @@ _fpsetround _fpsetsticky _mcount _memcpy -_sbrk _softfloat_float32_eq _softfloat_float32_le _softfloat_float32_lt @@ -67,10 +64,6 @@ _softfloat_float_exception_mask _softfloat_float_raise _softfloat_float_rounding_mode _stack -_thread_sys__brk -_thread_sys__sbrk -_thread_sys_exect -_thread_sys_syscall add64 add96 end @@ -80,7 +73,6 @@ frexpl ldexpl le64 lt64 -minbrk modfl mul32To64 mul64By32To96 diff --git a/lib/libc/arch/arm/sys/brk.S b/lib/libc/arch/arm/sys/brk.S index 27adaf62fa9..e348be27e0f 100644 --- a/lib/libc/arch/arm/sys/brk.S +++ b/lib/libc/arch/arm/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ +/* $OpenBSD: brk.S,v 1.6 2015/08/26 01:54:09 guenther Exp $ */ /* $NetBSD: brk.S,v 1.7 2003/12/26 11:23:44 martin Exp $ */ /*- @@ -35,23 +35,20 @@ #include "SYS.h" .globl _C_LABEL(end) - .globl CURBRK + .globl __curbrk -#ifdef WEAK_ALIAS WEAK_ALIAS(brk, _brk) -#endif .data .align 0 - .globl _C_LABEL(__minbrk) - .type _C_LABEL(__minbrk),#object -_C_LABEL(__minbrk): + .type __minbrk,#object +__minbrk: .word _C_LABEL(end) /* * Change the data segment size */ -SYSENTRY(_brk) +ENTRY(_brk) #ifdef __PIC__ /* Setup the GOT */ ldr r3, .Lgot @@ -94,6 +91,6 @@ SYSENTRY(_brk) .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8) #endif .Lminbrk: - .word PIC_SYM(_C_LABEL(__minbrk), GOT) + .word PIC_SYM(__minbrk, GOT) .Lcurbrk: - .word PIC_SYM(CURBRK, GOT) + .word PIC_SYM(__curbrk, GOT) diff --git a/lib/libc/arch/arm/sys/exect.S b/lib/libc/arch/arm/sys/exect.S deleted file mode 100644 index e90f9926d6b..00000000000 --- a/lib/libc/arch/arm/sys/exect.S +++ /dev/null @@ -1,37 +0,0 @@ -/* $OpenBSD: exect.S,v 1.2 2004/02/01 05:40:52 drahn Exp $ */ -/* $NetBSD: exect.S,v 1.4 2003/08/07 16:42:04 agc Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)exect.s 5.1 (Berkeley) 4/23/90 - */ - -#include "SYS.h" - -PSEUDO(exect,execve) diff --git a/lib/libc/arch/arm/sys/sbrk.S b/lib/libc/arch/arm/sys/sbrk.S index 6d501d71efb..cb594713e92 100644 --- a/lib/libc/arch/arm/sys/sbrk.S +++ b/lib/libc/arch/arm/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ +/* $OpenBSD: sbrk.S,v 1.6 2015/08/26 01:54:09 guenther Exp $ */ /* $NetBSD: sbrk.S,v 1.7 2003/08/07 16:42:05 agc Exp $ */ /*- @@ -36,19 +36,14 @@ .globl _C_LABEL(end) -#ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) -#endif .data .align 0 - .globl CURBRK - .type CURBRK,#object - .globl minbrk - .type minbrk,#object -CURBRK: - .word _C_LABEL(end) -_ASM_LABEL(minbrk): + .globl __curbrk + .type __curbrk,#object + .hidden __curbrk +__curbrk: .word _C_LABEL(end) /* @@ -88,4 +83,4 @@ SYSENTRY(_sbrk) .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8) #endif .Lcurbrk: - .word PIC_SYM(CURBRK, GOT) + .word PIC_SYM(__curbrk, GOT) |