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@

4 files changed, 17 insertions, 51 deletions

diff --git a/lib/libc/arch/powerpc/Symbols.list b/lib/libc/arch/powerpc/Symbols.list
index 4041c4ab73a..6a6381d9e1a 100644
--- a/lib/libc/arch/powerpc/Symbols.list
+++ b/lib/libc/arch/powerpc/Symbols.list
@@ -3,13 +3,8 @@ __floatundidf
 __plt_end
 __plt_start
 _mcount
-_thread_sys_brk
-_thread_sys_exect
-_thread_sys_sbrk
-_thread_sys_syscall
 end
 fabsl
 frexpl
 ldexpl
-minbrk
 modfl
diff --git a/lib/libc/arch/powerpc/sys/brk.S b/lib/libc/arch/powerpc/sys/brk.S
index f027e7c3c8a..4ba833e8e1f 100644
--- a/lib/libc/arch/powerpc/sys/brk.S
+++ b/lib/libc/arch/powerpc/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.9 2015/08/23 15:44:51 kettenis Exp $ */
+/* $OpenBSD: brk.S,v 1.10 2015/08/26 01:54:09 guenther Exp $ */
 
 /*
  * Copyright (c) 1996 Dale Rahn
@@ -27,10 +27,12 @@
 
 #include "SYS.h"
 
-	.extern _ASM_LABEL(__curbrk)
+	.extern __curbrk
 	.extern _C_LABEL(end)
 
-PREFIX2(brk,break)
+WEAK_ALIAS(brk, _brk)
+
+PREFIX2(_brk,break)
 	
 	/* check >= _end, if not make the call for _end */
 #ifndef __PIC__
@@ -53,10 +55,10 @@ PREFIX2(brk,break)
 	mr	7, 3
 	/* call break(size) */
 #ifndef __PIC__
-	addis	6, 0, _ASM_LABEL(__curbrk)@H
-	ori	6, 6, _ASM_LABEL(__curbrk)@L	/* # 6 = &__curbrk */
+	addis	6, 0, __curbrk@H
+	ori	6, 6, __curbrk@L	/* # 6 = &__curbrk */
 #else
-	lwz	6,_ASM_LABEL(__curbrk)@got(9)
+	lwz	6,__curbrk@got(9)
 #endif
 
 	sc
diff --git a/lib/libc/arch/powerpc/sys/exect.S b/lib/libc/arch/powerpc/sys/exect.S
deleted file mode 100644
index c468214c352..00000000000
--- a/lib/libc/arch/powerpc/sys/exect.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $OpenBSD: exect.S,v 1.7 2005/08/07 16:40:15 espie Exp $ */
-
-/*
- * Copyright (c) 1996 Dale Rahn
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#include "SYS.h"
-
-PSEUDO(exect,execve)
diff --git a/lib/libc/arch/powerpc/sys/sbrk.S b/lib/libc/arch/powerpc/sys/sbrk.S
index 1a581e184ae..c728b9c86ce 100644
--- a/lib/libc/arch/powerpc/sys/sbrk.S
+++ b/lib/libc/arch/powerpc/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.8 2015/08/23 15:44:51 kettenis Exp $ */
+/* $OpenBSD: sbrk.S,v 1.9 2015/08/26 01:54:09 guenther Exp $ */
 
 /*
  * Copyright (c) 1996 Dale Rahn
@@ -29,21 +29,20 @@
 
 	.data
 	.globl _end
-	.globl _ASM_LABEL(__curbrk)
-	.globl minbrk
-_ASM_LABEL(__curbrk):
-	.long _C_LABEL(end)
-_ASM_LABEL(minbrk):
+	.globl __curbrk
+	.hidden __curbrk
+__curbrk:
 	.long _C_LABEL(end)
 
+WEAK_ALIAS(sbrk, _sbrk)
 
 	.text
-PREFIX2(sbrk,break)
+PREFIX2(_sbrk,break)
 	
 	/* call break(__curbrk + size) */
 #ifndef __PIC__
-	addis	6, 0, _ASM_LABEL(__curbrk)@H
-	ori	6, 6, _ASM_LABEL(__curbrk)@L	/* # 6 = &__curbrk */
+	addis	6, 0, __curbrk@H
+	ori	6, 6, __curbrk@L	/* # 6 = &__curbrk */
 #else
 	mflr	10
 	bcl	20, 31, 1f
@@ -51,7 +50,7 @@ PREFIX2(sbrk,break)
 	addis	9, 9, _GLOBAL_OFFSET_TABLE_-1b@ha
 	addi	9, 9, _GLOBAL_OFFSET_TABLE_-1b@l
 	mtlr	10
-	lwz	6,_ASM_LABEL(__curbrk)@got(9)
+	lwz	6,__curbrk@got(9)
 #endif
 	lwz	5, 0(6)		/* # 5 = *6 (old_curbrk) */
 	add	3, 5, 3		/* # 3 = new_curbrk */