From 755662887e00c3892e7a5b15c30a50282459cb34 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Tue, 27 Jan 2015 03:03:14 +0000 Subject: [PATCH] compiler/pthread: Get pthread to compile (cleanly) on m68k again Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49948 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- compiler/pthread/pthread.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/pthread/pthread.c b/compiler/pthread/pthread.c index e1e9000e74..942b9d0803 100644 --- a/compiler/pthread/pthread.c +++ b/compiler/pthread/pthread.c @@ -831,7 +831,7 @@ void pthread_exit(void *value_ptr) #if defined __mc68000__ /* No CAS instruction on m68k */ -static int __sync_val_compare_and_swap(int *v, int o, int n) +static int __m68k_sync_val_compare_and_swap(int *v, int o, int n) { int ret; @@ -843,6 +843,8 @@ static int __sync_val_compare_and_swap(int *v, int o, int n) return ret; } +#undef __sync_val_compare_and_swap +#define __sync_val_compare_and_swap(v, o, n) __m68k_sync_val_compare_and_swap(v, o, n) #endif int pthread_once(pthread_once_t *once_control, void (*init_routine)(void)) @@ -1010,7 +1012,9 @@ static int _Init_Func(void) static void _Exit_Func(void) { +#if 0 pthread_t i; +#endif D(bug("%s()\n", __FUNCTION__)); -- 2.11.4.GIT