aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Rules2
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/spinlock.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/Rules b/Rules
index 974421d423..41970234ae 100644
--- a/Rules
+++ b/Rules
@@ -96,7 +96,7 @@ endif
ifeq ($(build-programs),yes)
binaries-all = $(others) $(sysdep-others) $(tests) $(test-srcs)
-binaries-static = $(others-static)
+binaries-static = $(others-static) $(tests-static)
else
binaries-all = $(tests) $(test-srcs)
binaries-static =
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index aac2e47bfb..54ee1cff8b 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-03 Ulrich Drepper <drepper@redhat.com>
+
+ * spinlock.h (testandset): Add cast to avoid warning.
+ Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
+
2000-09-02 Andreas Jaeger <aj@suse.de>
* sysdeps/pthread/timer_routines.c: Include stdlib.h for abort
diff --git a/linuxthreads/spinlock.h b/linuxthreads/spinlock.h
index f88e8f3b0e..b3d02314bf 100644
--- a/linuxthreads/spinlock.h
+++ b/linuxthreads/spinlock.h
@@ -49,7 +49,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval,
#elif defined(HAS_COMPARE_AND_SWAP)
#ifdef IMPLEMENT_TAS_WITH_CAS
-#define testandset(p) !__compare_and_swap(p, 0, 1)
+#define testandset(p) !__compare_and_swap((long int *) p, 0, 1)
#endif
#ifdef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS