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

libc_r.

5 files changed, 10 insertions, 0 deletions

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