summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/include/posix-threads.h15
2 files changed, 7 insertions, 13 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f46c2830660..7734e0ee571 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11 Richard Henderson <rth@redhat.com>
+
+ * include/posix-threads.h <__alpha__> (_Jv_ThreadId_t): Use void*.
+ (_Jv_ThreadSelf): Use __builtin_thread_pointer.
+
2004-10-08 Bryce McKinlay <mckinlay@redhat.com>
* java/util/Calendar.java (set): Invalidate DST_OFFSET
diff --git a/libjava/include/posix-threads.h b/libjava/include/posix-threads.h
index 01606df021f..ccb69ada1a2 100644
--- a/libjava/include/posix-threads.h
+++ b/libjava/include/posix-threads.h
@@ -241,23 +241,12 @@ _Jv_ThreadSelf (void)
#ifdef __alpha__
-#ifdef __FreeBSD__
-#include <machine/pal.h>
-#define PAL_rduniq PAL_rdunique
-#elif defined (__osf__)
-#include <machine/pal.h>
-#else
-#include <asm/pal.h>
-#endif
-
-typedef unsigned long _Jv_ThreadId_t;
+typedef void *_Jv_ThreadId_t;
inline _Jv_ThreadId_t
_Jv_ThreadSelf (void)
{
- register unsigned long id __asm__("$0");
- __asm__ ("call_pal %1" : "=r"(id) : "i"(PAL_rduniq));
- return id;
+ return __builtin_thread_pointer ();
}
#define JV_SELF_DEFINED