Turn off default generation of userland dot symbols on powerpc64 now that

we have a binutils that supports it. Kernel dot symbols remain on to assist
DDB.

10 files changed, 20 insertions, 31 deletions

diff --git a/lib/csu/powerpc64/crti.S b/lib/csu/powerpc64/crti.S
index 16a22c2..767d920 100644
--- a/lib/csu/powerpc64/crti.S
+++ b/lib/csu/powerpc64/crti.S
@@ -32,13 +32,12 @@ __FBSDID("$FreeBSD$");
 	.section ".opd","aw"
 	.align	3
 _init:
-	.quad	._init,.TOC.@tocbase,0
+	.quad	.L._init,.TOC.@tocbase,0
 	.previous
+	.type	_init,@function
 
 	.align 4
-	.global	._init
-	.type	._init,@function
-._init:
+.L._init:
 	stdu 1,-48(1)
 	mflr 0
 	std 0,64(1)
@@ -49,13 +48,12 @@ _init:
 	.section ".opd","aw"
 	.align	3
 _fini:
-	.quad	._fini,.TOC.@tocbase,0
+	.quad	.L._fini,.TOC.@tocbase,0
 	.previous
+	.type	_fini,@function
 
 	.align 4
-	.global	._fini
-	.type	._fini,@function
-._fini:
+.L._fini:
 	stdu 1,-48(1)
 	mflr 0
 	std 0,64(1)
diff --git a/lib/libc/gen/_thread_init.c b/lib/libc/gen/_thread_init.c
index 0c16d8f..c0b6ade 100644
--- a/lib/libc/gen/_thread_init.c
+++ b/lib/libc/gen/_thread_init.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
 void _thread_init_stub(void);
 
 __weak_reference(_thread_init_stub, _thread_init);
-__weak_reference_data(_thread_autoinit_dummy_decl_stub,
+__weak_reference(_thread_autoinit_dummy_decl_stub,
     _thread_autoinit_dummy_decl);
 
 int	_thread_autoinit_dummy_decl_stub = 0;
diff --git a/lib/libc/powerpc64/SYS.h b/lib/libc/powerpc64/SYS.h
index 7816825..a361767 100644
--- a/lib/libc/powerpc64/SYS.h
+++ b/lib/libc/powerpc64/SYS.h
@@ -45,7 +45,7 @@
 2:	mflr	%r0;						\
 	std	%r0,16(%r1);					\
 	stdu	%r1,-48(%r1);					\
-	bl	PIC_PLT(CNAME(HIDENAME(cerror)));		\
+	bl	CNAME(HIDENAME(cerror));			\
 	nop;							\
 	addi	%r1,%r1,48;					\
 	ld	%r0,16(%r1);					\
@@ -56,10 +56,6 @@ ENTRY(__CONCAT(__sys_,x));					\
 	.set	CNAME(x),CNAME(__CONCAT(__sys_,x));		\
 	.weak	CNAME(__CONCAT(_,x));				\
 	.set	CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x));	\
-	.weak	CNAME(__CONCAT(.,x));				\
-	.set	CNAME(__CONCAT(.,x)),CNAME(__CONCAT(.__sys_,x));\
-	.weak	CNAME(__CONCAT(._,x));				\
-	.set	CNAME(__CONCAT(._,x)),CNAME(__CONCAT(.__sys_,x));\
 	_SYSCALL(x);						\
 	bso	2b
 
@@ -69,14 +65,12 @@ ENTRY(__CONCAT(__sys_,x));					\
 ENTRY(__CONCAT(__sys_,x));					\
 	.weak	CNAME(__CONCAT(_,x));				\
 	.set	CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x));	\
-	.weak	CNAME(__CONCAT(._,x));				\
-	.set	CNAME(__CONCAT(._,x)),CNAME(__CONCAT(.__sys_,x));\
 	_SYSCALL(x);						\
 	bnslr;							\
 	mflr	%r0;						\
 	std	%r0,16(%r1);					\
 	stdu	%r1,-48(%r1);					\
-	bl	PIC_PLT(CNAME(HIDENAME(cerror)));		\
+	bl	CNAME(HIDENAME(cerror));			\
 	nop;							\
 	addi	%r1,%r1,48;					\
 	ld	%r0,16(%r1);					\
@@ -91,17 +85,13 @@ ENTRY(__CONCAT(__sys_,x));					\
 	.set	CNAME(x),CNAME(__CONCAT(__sys_,x));		\
 	.weak	CNAME(__CONCAT(_,x));				\
 	.set	CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x));	\
-	.weak	CNAME(__CONCAT(.,x));				\
-	.set	CNAME(__CONCAT(.,x)),CNAME(__CONCAT(.__sys_,x));\
-	.weak	CNAME(__CONCAT(._,x));				\
-	.set	CNAME(__CONCAT(._,x)),CNAME(__CONCAT(.__sys_,x));\
 	_SYSCALL(x);						\
 	bnslr;							\
 								\
 	mflr	%r0;						\
 	std	%r0,16(%r1);					\
 	stdu	%r1,-48(%r1);					\
-	bl	PIC_PLT(CNAME(HIDENAME(cerror)));		\
+	bl	CNAME(HIDENAME(cerror));			\
 	nop;							\
 	addi	%r1,%r1,48;					\
 	ld	%r0,16(%r1);					\
diff --git a/lib/libc/powerpc64/gen/_ctx_start.S b/lib/libc/powerpc64/gen/_ctx_start.S
index 6e373c8..79df041 100644
--- a/lib/libc/powerpc64/gen/_ctx_start.S
+++ b/lib/libc/powerpc64/gen/_ctx_start.S
@@ -38,12 +38,13 @@
 	blrl			/* branch to start function */
 	mr	%r3,%r15	/* pass pointer to ucontext as argument */
 	nop
-	bl	PIC_PLT(CNAME(_ctx_done)) /* branch to ctxt completion func */
+	bl	CNAME(_ctx_done) /* branch to ctxt completion func */
 	/*
 	 * we should never return from the
 	 * above branch.
 	 */
 	nop
-	bl	PIC_PLT(CNAME(abort))	/* abort */
+	bl	CNAME(abort)	/* abort */
+	nop
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/sys/brk.S b/lib/libc/powerpc64/sys/brk.S
index 1e71663..675b400 100644
--- a/lib/libc/powerpc64/sys/brk.S
+++ b/lib/libc/powerpc64/sys/brk.S
@@ -63,7 +63,7 @@ ENTRY(brk)
 	mflr	%r0
 	std	%r0,16(%r1)
 	stdu	%r1,-48(%r1)
-	bl	PIC_PLT(HIDENAME(cerror))
+	bl	HIDENAME(cerror)
 	nop
 	ld	%r1,0(%r1)
 	ld	%r0,16(%r1)
diff --git a/lib/libc/powerpc64/sys/cerror.S b/lib/libc/powerpc64/sys/cerror.S
index db7a10f..9bf33bf 100644
--- a/lib/libc/powerpc64/sys/cerror.S
+++ b/lib/libc/powerpc64/sys/cerror.S
@@ -45,7 +45,7 @@ ENTRY(HIDENAME(cerror))
 	std	%r31,48(%r1)
 
 	mr	%r31,%r3          /* stash errval in callee-saved register */
-	bl	PIC_PLT(CNAME(__error))
+	bl	CNAME(__error)
 	nop
 	stw	%r31,0(%r3)		/* store errval into &errno */
 
diff --git a/lib/libc/powerpc64/sys/exect.S b/lib/libc/powerpc64/sys/exect.S
index b752fb8..aa34b9e 100644
--- a/lib/libc/powerpc64/sys/exect.S
+++ b/lib/libc/powerpc64/sys/exect.S
@@ -39,7 +39,7 @@ ENTRY(exect)
 	mflr	%r0
 	std	%r0,16(%r1)
 	stdu	%r1,-48(%r1)
-	bl	PIC_PLT(HIDENAME(cerror))
+	bl	HIDENAME(cerror)
 	nop
 	ld	%r1,0(%r1)
 	ld	%r0,16(%r1)
diff --git a/lib/libc/powerpc64/sys/pipe.S b/lib/libc/powerpc64/sys/pipe.S
index 0a92df5..efd3dd6 100644
--- a/lib/libc/powerpc64/sys/pipe.S
+++ b/lib/libc/powerpc64/sys/pipe.S
@@ -43,7 +43,7 @@ ENTRY(pipe)
 	mflr	%r0
 	std	%r0,16(%r1)
 	stdu	%r1,-48(%r1)
-	bl	PIC_PLT(HIDENAME(cerror))
+	bl	HIDENAME(cerror)
 	nop
 	ld	%r1,0(%r1)
 	ld	%r0,16(%r1)
diff --git a/lib/libc/powerpc64/sys/ptrace.S b/lib/libc/powerpc64/sys/ptrace.S
index bda17e8..ede00e7 100644
--- a/lib/libc/powerpc64/sys/ptrace.S
+++ b/lib/libc/powerpc64/sys/ptrace.S
@@ -39,7 +39,7 @@ ENTRY(ptrace)
 	std	%r5,56(%r1)
 	stw	%r6,64(%r1)
 
-	bl	PIC_PLT(CNAME(__error))
+	bl	CNAME(__error)
 	nop
 	li	%r7,0
 	stw	%r7,0(%r3)
@@ -57,7 +57,7 @@ ENTRY(ptrace)
 	blr
 1:
 	stdu	%r1,-48(%r1)		/* lr already saved */
-	bl	PIC_PLT(HIDENAME(cerror))
+	bl	HIDENAME(cerror)
 	nop
 	ld	%r1,0(%r1)
 	ld	%r0,16(%r1)
diff --git a/lib/libc/powerpc64/sys/sbrk.S b/lib/libc/powerpc64/sys/sbrk.S
index c767049..e147493 100644
--- a/lib/libc/powerpc64/sys/sbrk.S
+++ b/lib/libc/powerpc64/sys/sbrk.S
@@ -58,7 +58,7 @@ ENTRY(sbrk)
 	mflr	%r0
 	std	%r0,16(%r1)
 	stdu	%r1,-48(%r1)
-	bl	PIC_PLT(HIDENAME(cerror))
+	bl	HIDENAME(cerror)
 	nop
 	ld	%r1,0(%r1)
 	ld	%r0,16(%r1)