Take care to avoid having "strong" and "weak" symbols of the same name in

libc_r.

10 files changed, 14 insertions, 12 deletions

diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 8e14e92..923300b 100644
--- a/lib/libc/alpha/SYS.h
+++ b/lib/libc/alpha/SYS.h
@@ -104,14 +104,10 @@ END(___CONCAT(_thread_sys_,name))
 
 #define	PSYSCALL(name)						\
 PLEAF(name,0);				/* XXX # of args? */	\
-	WEAK_ALIAS(__CONCAT(_,name), __CONCAT(_thread_sys_,name));	\
-	WEAK_ALIAS(name, __CONCAT(_,name));			\
 	CALLSYS_ERROR(name)
 
 #define	PRSYSCALL(name)						\
 PLEAF(name,0);				/* XXX # of args? */	\
-	WEAK_ALIAS(__CONCAT(_,name), __CONCAT(_thread_sys_,name));	\
-	WEAK_ALIAS(name, __CONCAT(_,name));			\
 	CALLSYS_ERROR(name)					\
 	RET;							\
 PEND(name)
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index 155672f..cadbecb 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -73,10 +73,6 @@
  */
 #define	PSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
 			ENTRY(__CONCAT(_thread_sys_,x));		\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(_thread_sys_,x));\
-			.weak CNAME(x);					\
-			.set CNAME(x),CNAME(__CONCAT(_,x));		\
 			lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
 #define	PRSYSCALL(x)	PSYSCALL(x); ret
 #define	PPSEUDO(x,y)	ENTRY(__CONCAT(_thread_sys_,x));		\
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index 3d17305..42759e7 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -51,4 +51,6 @@ __creat(path, mode)
 	return(_open(path, O_WRONLY|O_CREAT|O_TRUNC, mode));
 }
 
+#ifndef _THREAD_SAFE
 __weak_reference(__creat, creat);
+#endif
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index 3327c96..f7ddb18 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -49,4 +49,6 @@ __pause()
 	return sigpause(sigblock(0L));
 }
 
+#ifndef _THREAD_SAFE
 __weak_reference(__pause, pause);
+#endif
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index 2508e9a..e4c4fbd 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -68,4 +68,6 @@ __sleep(seconds)
 		(time_remaining.tv_nsec != 0)); /* round up */
 }
 
+#ifndef _THREAD_SAFE
 __weak_reference(__sleep, sleep);
+#endif
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
index 466827e..f321876 100644
--- a/lib/libc/gen/termios.c
+++ b/lib/libc/gen/termios.c
@@ -195,7 +195,9 @@ __tcdrain(fd)
 	return (ioctl(fd, TIOCDRAIN, 0));
 }
 
+#ifndef _THREAD_SAFE
 __weak_reference(__tcdrain, tcdrain);
+#endif
 
 int
 tcflush(fd, which)
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index 2f9ca6e..366e262 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -49,4 +49,6 @@ __wait(istat)
 	return (wait4(WAIT_ANY, istat, 0, (struct rusage *)0));
 }
 
+#ifndef _THREAD_SAFE
 __weak_reference(__wait, wait);
+#endif
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index 3f679a7..350157a 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -55,4 +55,6 @@ __waitpid(pid, istat, options)
 	return (wait4(pid, istat, options, (struct rusage *)0));
 }
 
+#ifndef _THREAD_SAFE
 __weak_reference(__waitpid, waitpid);
+#endif
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 155672f..cadbecb 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -73,10 +73,6 @@
  */
 #define	PSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
 			ENTRY(__CONCAT(_thread_sys_,x));		\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(_thread_sys_,x));\
-			.weak CNAME(x);					\
-			.set CNAME(x),CNAME(__CONCAT(_,x));		\
 			lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
 #define	PRSYSCALL(x)	PSYSCALL(x); ret
 #define	PPSEUDO(x,y)	ENTRY(__CONCAT(_thread_sys_,x));		\
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
index 236a8b0..c7e68ba 100644
--- a/lib/libc/stdlib/system.c
+++ b/lib/libc/stdlib/system.c
@@ -94,4 +94,6 @@ __system(command)
 	return(pid == -1 ? -1 : pstat);
 }
 
+#ifndef _THREAD_SAFE
 __weak_reference(__system, system);
+#endif