diff options
| author | emaste <emaste@FreeBSD.org> | 2014-11-25 03:50:31 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-11-25 03:50:31 +0000 |
| commit | fda27c9937b724b3c3e24266d58c4be4d1839e7f (patch) | |
| tree | 8af8a3fb8f37ea396b60dd6e474d26d3b108cc1a /lib/libthr/thread | |
| parent | d375864ce9ed7583a0bf26a4f4933a26c49ecd60 (diff) | |
| download | FreeBSD-src-fda27c9937b724b3c3e24266d58c4be4d1839e7f.zip FreeBSD-src-fda27c9937b724b3c3e24266d58c4be4d1839e7f.tar.gz | |
Revert r274772: it is not valid on MIPS
Reported by: sbruno
Diffstat (limited to 'lib/libthr/thread')
| -rw-r--r-- | lib/libthr/thread/thr_exit.c | 10 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_private.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c index 7b13db6..7001311 100644 --- a/lib/libthr/thread/thr_exit.c +++ b/lib/libthr/thread/thr_exit.c @@ -54,7 +54,7 @@ __weak_reference(_pthread_exit, pthread_exit); static int message_printed; static void thread_unwind(void) __dead2; -#ifdef __PIC__ +#ifdef PIC static void thread_uw_init(void); static _Unwind_Reason_Code thread_unwind_stop(int version, _Unwind_Action actions, @@ -114,7 +114,7 @@ _Unwind_GetCFA(struct _Unwind_Context *context) #else #pragma weak _Unwind_GetCFA #pragma weak _Unwind_ForcedUnwind -#endif /* __PIC__ */ +#endif /* PIC */ static void thread_unwind_cleanup(_Unwind_Reason_Code code, struct _Unwind_Exception *e) @@ -222,11 +222,11 @@ _pthread_exit_mask(void *status, sigset_t *mask) curthread->ret = status; #ifdef _PTHREAD_FORCED_UNWIND -#ifdef __PIC__ +#ifdef PIC thread_uw_init(); -#endif /* __PIC__ */ +#endif /* PIC */ -#ifdef __PIC__ +#ifdef PIC if (uwl_forcedunwind != NULL) { #else if (_Unwind_ForcedUnwind != NULL) { diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index f9735e7..c6651cd 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -100,7 +100,7 @@ TAILQ_HEAD(mutex_queue, pthread_mutex); #define THR_ASSERT(cond, msg) #endif -#ifdef __PIC__ +#ifdef PIC # define STATIC_LIB_REQUIRE(name) #else # define STATIC_LIB_REQUIRE(name) __asm (".globl " #name) |
