The GCC developers have made good on their threats against #pragma for 3.1.

Use __weak_reference in place of the #pragma.

Submitted by:	eischen

5 files changed, 8 insertions, 5 deletions

diff --git a/lib/libc_r/uthread/uthread_cap_get_fd.c b/lib/libc_r/uthread/uthread_cap_get_fd.c
index 7d42917..0f0b3e3 100644
--- a/lib/libc_r/uthread/uthread_cap_get_fd.c
+++ b/lib/libc_r/uthread/uthread_cap_get_fd.c
@@ -31,7 +31,7 @@
 #include <pthread.h>
 #include "pthread_private.h"
 
-#pragma weak __cap_get_fd=___cap_get_fd
+__weak_reference(___cap_get_fd, __cap_get_fd);
 
 int
 ___cap_get_fd(int fd, struct cap *cap_p)
diff --git a/lib/libc_r/uthread/uthread_cap_set_fd.c b/lib/libc_r/uthread/uthread_cap_set_fd.c
index e911b6b..5a8b668 100644
--- a/lib/libc_r/uthread/uthread_cap_set_fd.c
+++ b/lib/libc_r/uthread/uthread_cap_set_fd.c
@@ -31,7 +31,7 @@
 #include <pthread.h>
 #include "pthread_private.h"
 
-#pragma weak __cap_set_fd=___cap_set_fd
+__weak_reference(___cap_set_fd, __cap_set_fd);
 
 int
 ___cap_set_fd(int fd, cap_t cap_p)
diff --git a/lib/libc_r/uthread/uthread_main_np.c b/lib/libc_r/uthread/uthread_main_np.c
index 6ae7d1e..54c2018 100644
--- a/lib/libc_r/uthread/uthread_main_np.c
+++ b/lib/libc_r/uthread/uthread_main_np.c
@@ -31,10 +31,11 @@
 #include <pthread_np.h>
 #include "pthread_private.h"
 
+__weak_reference(_pthread_main_np, pthread_main_np);
+
 /*
  * Provide the equivelant to Solaris thr_main() function
  */
-#pragma weak    pthread_main_np=_pthread_main_np
 int
 _pthread_main_np()
 {
diff --git a/lib/libkse/thread/thr_main_np.c b/lib/libkse/thread/thr_main_np.c
index 6ae7d1e..54c2018 100644
--- a/lib/libkse/thread/thr_main_np.c
+++ b/lib/libkse/thread/thr_main_np.c
@@ -31,10 +31,11 @@
 #include <pthread_np.h>
 #include "pthread_private.h"
 
+__weak_reference(_pthread_main_np, pthread_main_np);
+
 /*
  * Provide the equivelant to Solaris thr_main() function
  */
-#pragma weak    pthread_main_np=_pthread_main_np
 int
 _pthread_main_np()
 {
diff --git a/lib/libpthread/thread/thr_main_np.c b/lib/libpthread/thread/thr_main_np.c
index 6ae7d1e..54c2018 100644
--- a/lib/libpthread/thread/thr_main_np.c
+++ b/lib/libpthread/thread/thr_main_np.c
@@ -31,10 +31,11 @@
 #include <pthread_np.h>
 #include "pthread_private.h"
 
+__weak_reference(_pthread_main_np, pthread_main_np);
+
 /*
  * Provide the equivelant to Solaris thr_main() function
  */
-#pragma weak    pthread_main_np=_pthread_main_np
 int
 _pthread_main_np()
 {