[kaffe] CVS kaffe (robilad): Fixed make CFLAGS=something and various warnings in pthreads

Sat Feb 5 11:46:47 PST 2005

PatchSet 5978 
Date: 2005/02/05 19:41:58
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed make CFLAGS=something and various warnings in pthreads

2005-02-05  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: Don't add PTHREAD_CFLAGS to CFLAGS.
        That fixes 'make CFLAGS=-Wall' again.

        * kaffe/kaffevm/Makefile.am (SUBDIRS): Build threads
        before gc, because gc depends on them.

        * kaffe/kaffevm/kaffe-gc/Makefile.am
        (libkaffegc_la_DEPENDENCIES): Added dependency on threads.

        * kaffe/kaffevm/systems/unix-pthreads/Makefile.am
        (libkthread_la_CFLAGS): Set to PTHREAD_CFLAGS.

        * kaffe/kaffevm/systems/unix-pthreads/thread-impl.c
        (jthread_yield): Moved over here.

        * kaffe/kaffevm/systems/unix-pthreads/thread-internal.h
        (jthread_yield): Removed. Fixes numerous compiler warnings.

        * libraries/clib/libxmlj/Makefile.am (libxmlj_la_LDFLAGS):
        Added PTHREAD_LIBS.
        (libxmlj_la_CFLAGS): Added PTHREAD_CFLAGS.

Members: 
	ChangeLog:1.3516->1.3517 
	configure:1.417->1.418 
	configure.ac:1.108->1.109 
	kaffe/kaffevm/Makefile.am:1.70->1.71 
	kaffe/kaffevm/Makefile.in:1.188->1.189 
	kaffe/kaffevm/kaffe-gc/Makefile.am:1.3->1.4 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.23->1.24 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.11->1.12 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.102->1.103 
	kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.68->1.69 
	kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.33->1.34 
	libraries/clib/libxmlj/Makefile.am:1.6->1.7 
	libraries/clib/libxmlj/Makefile.in:1.36->1.37 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3516 kaffe/ChangeLog:1.3517

--- kaffe/ChangeLog:1.3516	Sat Feb  5 17:55:17 2005
+++ kaffe/ChangeLog	Sat Feb  5 19:41:58 2005
@@ -1,3 +1,27 @@
+2005-02-05  Dalibor Topic  <robilad at kaffe.org>
+
+	* configure.ac: Don't add PTHREAD_CFLAGS to CFLAGS.
+	That fixes 'make CFLAGS="-Wall"' again.
+
+	* kaffe/kaffevm/Makefile.am (SUBDIRS): Build threads
+	before gc, because gc depends on them.
+
+	* kaffe/kaffevm/kaffe-gc/Makefile.am 
+	(libkaffegc_la_DEPENDENCIES): Added dependency on threads.
+
+	* kaffe/kaffevm/systems/unix-pthreads/Makefile.am
+	(libkthread_la_CFLAGS): Set to PTHREAD_CFLAGS.
+
+	* kaffe/kaffevm/systems/unix-pthreads/thread-impl.c
+	(jthread_yield): Moved over here.
+
+	* kaffe/kaffevm/systems/unix-pthreads/thread-internal.h
+	(jthread_yield): Removed. Fixes numerous compiler warnings.
+
+	* libraries/clib/libxmlj/Makefile.am (libxmlj_la_LDFLAGS):
+	Added PTHREAD_LIBS.
+	(libxmlj_la_CFLAGS): Added PTHREAD_CFLAGS.
+
 2005-02-05  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/jni/jni.c
Index: kaffe/configure
diff -u kaffe/configure:1.417 kaffe/configure:1.418
--- kaffe/configure:1.417	Sat Feb  5 17:46:00 2005
+++ kaffe/configure	Sat Feb  5 19:42:00 2005
@@ -28174,7 +28174,6 @@
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test x"$acx_pthread_ok" = xyes; then
         THREADLIBS="$PTHREAD_LIBS "
-		     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
                      CC="$PTHREAD_CC"
         :
 else
@@ -58454,7 +58453,7 @@
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 58457: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 58456: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -58572,7 +58571,7 @@
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 58575 "configure" */
+/* #line 58574 "configure" */
 public class Test {
 }
 EOF
@@ -58609,7 +58608,7 @@
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 58612 "configure" */
+/* [#]line 58611 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.108 kaffe/configure.ac:1.109
--- kaffe/configure.ac:1.108	Sat Feb  5 17:46:19 2005
+++ kaffe/configure.ac	Sat Feb  5 19:42:08 2005
@@ -667,7 +667,6 @@
 dnl Check for thread libraries
 if test x$with_threads = xunix-pthreads ; then
 	ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS "
-		     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
                      CC="$PTHREAD_CC"])
 	AC_CHECK_LIB(semaphore,sem_init,SEMAPHORE_LIB)
 	AC_SUBST(SEMAPHORE_LIB)
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.70 kaffe/kaffe/kaffevm/Makefile.am:1.71
--- kaffe/kaffe/kaffevm/Makefile.am:1.70	Sun Jan 30 12:42:40 2005
+++ kaffe/kaffe/kaffevm/Makefile.am	Sat Feb  5 19:42:10 2005
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
-SUBDIRS = $(ENGINE_NAME) $(GC_NAME) systems gcj verifier jni
+SUBDIRS = $(ENGINE_NAME) systems $(GC_NAME) gcj verifier jni
 DIST_SUBDIRS = boehm-gc kaffe-gc intrp jit jit3 systems gcj verifier jni
 
 EXTRA_DIST = \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.188 kaffe/kaffe/kaffevm/Makefile.in:1.189
--- kaffe/kaffe/kaffevm/Makefile.in:1.188	Sat Feb  5 17:46:38 2005
+++ kaffe/kaffe/kaffevm/Makefile.in	Sat Feb  5 19:42:10 2005
@@ -427,7 +427,7 @@
 toolslibdir = @toolslibdir@
 uudecode = @uudecode@
 with_engine = @with_engine@
-SUBDIRS = $(ENGINE_NAME) $(GC_NAME) systems gcj verifier jni
+SUBDIRS = $(ENGINE_NAME) systems $(GC_NAME) gcj verifier jni
 DIST_SUBDIRS = boehm-gc kaffe-gc intrp jit jit3 systems gcj verifier jni
 EXTRA_DIST = \
 	kaffe.def \
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.3 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.4
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.3	Sun Dec 12 18:52:27 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am	Sat Feb  5 19:42:11 2005
@@ -1,7 +1,8 @@
 # Makefile.am for the garbage collector - original Kaffe's GC.
 #
-# Copyright (c) 2004
-#	Kaffe.org contributors, see ChangeLogs for details.  All rights reserved.
+# Copyright (c) 2004, 2005
+#	Kaffe.org contributors, see ChangeLogs for details.  
+#       All rights reserved.
 #
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
@@ -29,5 +30,8 @@
 	gc-incremental.c \
 	gc-mem.c \
 	gc-refs.c
+
+libkaffegc_la_DEPENDENCIES = \
+        $(top_builddir)/kaffe/kaffevm/systems/$(THREAD_SYSTEM)/libkthread.la
 
 noinst_HEADERS= gc-mem.h gc-incremental.h gc-refs.h
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.23 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.24
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.23	Sat Feb  5 17:46:55 2005
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in	Sat Feb  5 19:42:11 2005
@@ -16,8 +16,9 @@
 
 # Makefile.am for the garbage collector - original Kaffe's GC.
 #
-# Copyright (c) 2004
-#	Kaffe.org contributors, see ChangeLogs for details.  All rights reserved.
+# Copyright (c) 2004, 2005
+#	Kaffe.org contributors, see ChangeLogs for details.  
+#       All rights reserved.
 #
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
@@ -405,6 +406,9 @@
 	gc-incremental.c \
 	gc-mem.c \
 	gc-refs.c
+
+libkaffegc_la_DEPENDENCIES = \
+        $(top_builddir)/kaffe/kaffevm/systems/$(THREAD_SYSTEM)/libkthread.la
 
 noinst_HEADERS = gc-mem.h gc-incremental.h gc-refs.h
 all: all-am
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.11 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.12
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.11	Sat Nov 20 15:57:47 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am	Sat Feb  5 19:42:11 2005
@@ -19,6 +19,9 @@
 	$(PTHREAD_LIBS) \
 	$(SEMAPHORE_LIB)
 
+libkthread_la_CFLAGS = \
+	$(PTHREAD_CFLAGS)
+
 libkthread_la_SOURCES = lock-impl.c signal.c syscalls.c thread-impl.c
 EXTRA_DIST = Makefile.frag lock-impl.h thread-impl.h thread-internal.h \
 		jsignal.h jthread.h
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.102 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.103
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.102	Sat Feb  5 17:47:05 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in	Sat Feb  5 19:42:11 2005
@@ -84,8 +84,9 @@
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libkthread_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libkthread_la_OBJECTS = lock-impl.lo signal.lo syscalls.lo \
-	thread-impl.lo
+am_libkthread_la_OBJECTS = libkthread_la-lock-impl.lo \
+	libkthread_la-signal.lo libkthread_la-syscalls.lo \
+	libkthread_la-thread-impl.lo
 libkthread_la_OBJECTS = $(am_libkthread_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
@@ -387,6 +388,9 @@
 	$(PTHREAD_LIBS) \
 	$(SEMAPHORE_LIB)
 
+libkthread_la_CFLAGS = \
+	$(PTHREAD_CFLAGS)
+
 libkthread_la_SOURCES = lock-impl.c signal.c syscalls.c thread-impl.c
 EXTRA_DIST = Makefile.frag lock-impl.h thread-impl.h thread-internal.h \
 		jsignal.h jthread.h
@@ -457,10 +461,10 @@
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lock-impl.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signal.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/syscalls.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thread-impl.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkthread_la-lock-impl.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkthread_la-signal.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkthread_la-syscalls.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkthread_la-thread-impl.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -482,6 +486,34 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+libkthread_la-lock-impl.lo: lock-impl.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -MT libkthread_la-lock-impl.lo -MD -MP -MF "$(DEPDIR)/libkthread_la-lock-impl.Tpo" -c -o libkthread_la-lock-impl.lo `test -f 'lock-impl.c' || echo '$(srcdir)/'`lock-impl.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libkthread_la-lock-impl.Tpo" "$(DEPDIR)/libkthread_la-lock-impl.Plo"; else rm -f "$(DEPDIR)/libkthread_la-lock-impl.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lock-impl.c' object='libkthread_la-lock-impl.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -c -o libkthread_la-lock-impl.lo `test -f 'lock-impl.c' || echo '$(srcdir)/'`lock-impl.c
+
+libkthread_la-signal.lo: signal.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -MT libkthread_la-signal.lo -MD -MP -MF "$(DEPDIR)/libkthread_la-signal.Tpo" -c -o libkthread_la-signal.lo `test -f 'signal.c' || echo '$(srcdir)/'`signal.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libkthread_la-signal.Tpo" "$(DEPDIR)/libkthread_la-signal.Plo"; else rm -f "$(DEPDIR)/libkthread_la-signal.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='signal.c' object='libkthread_la-signal.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -c -o libkthread_la-signal.lo `test -f 'signal.c' || echo '$(srcdir)/'`signal.c
+
+libkthread_la-syscalls.lo: syscalls.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -MT libkthread_la-syscalls.lo -MD -MP -MF "$(DEPDIR)/libkthread_la-syscalls.Tpo" -c -o libkthread_la-syscalls.lo `test -f 'syscalls.c' || echo '$(srcdir)/'`syscalls.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libkthread_la-syscalls.Tpo" "$(DEPDIR)/libkthread_la-syscalls.Plo"; else rm -f "$(DEPDIR)/libkthread_la-syscalls.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='syscalls.c' object='libkthread_la-syscalls.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -c -o libkthread_la-syscalls.lo `test -f 'syscalls.c' || echo '$(srcdir)/'`syscalls.c
+
+libkthread_la-thread-impl.lo: thread-impl.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -MT libkthread_la-thread-impl.lo -MD -MP -MF "$(DEPDIR)/libkthread_la-thread-impl.Tpo" -c -o libkthread_la-thread-impl.lo `test -f 'thread-impl.c' || echo '$(srcdir)/'`thread-impl.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libkthread_la-thread-impl.Tpo" "$(DEPDIR)/libkthread_la-thread-impl.Plo"; else rm -f "$(DEPDIR)/libkthread_la-thread-impl.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='thread-impl.c' object='libkthread_la-thread-impl.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkthread_la_CFLAGS) $(CFLAGS) -c -o libkthread_la-thread-impl.lo `test -f 'thread-impl.c' || echo '$(srcdir)/'`thread-impl.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.68 kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.69
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.68	Sat Jan 15 21:55:45 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c	Sat Feb  5 19:42:12 2005
@@ -4,6 +4,10 @@
  * Copyright (c) 1998
  *      Transvirtual Technologies, Inc.  All rights reserved.
  *
+ * Copyright (c) 2005
+ *      Kaffe.org contributors.  See ChangeLog for details. 
+ *      All rights reserved.
+ *
  * See the file "license.terms" for information on usage and redistribution
  * of this file.
  */
@@ -27,6 +31,16 @@
 #include "boehm-gc/boehm/include/gc.h"
 #endif
 
+/* define __USE_GNU for pthread_yield on linux */
+#define __USE_GNU
+#include <pthread.h>
+
+#if !defined(HAVE_PTHREAD_YIELD) && defined(HAVE_SCHED_YIELD)
+#if defined(HAVE_SCHED_H)
+#include <sched.h>
+#endif // SCHED_H
+#endif // SCHED_YIELD && !PTHREAD_YIELD
+
 #ifndef MAINSTACKSIZE
 #define MAINSTACKSIZE (1024*1024)
 #endif
@@ -1148,6 +1162,20 @@
 {
 }
 #endif
+
+/**
+ * yield.
+ *
+ */
+void 
+jthread_yield (void)
+{
+#if defined(HAVE_PTHREAD_YIELD)
+  pthread_yield();
+#elif defined(HAVE_SCHED_YIELD)
+  sched_yield();
+#endif
+}
 
 /*******************************************************************************
  * the suspend/resume mechanism
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.33 kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.34
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.33	Sat Feb  5 17:12:08 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h	Sat Feb  5 19:42:12 2005
@@ -4,6 +4,10 @@
  * Copyright (c) 1998
  *      Transvirtual Technologies, Inc.  All rights reserved.
  *
+ * Copyright (c) 2005
+ *      Kaffe.org contributors.  See ChangeLog for details.
+ *      All rights reserved.
+ *
  * See the file "license.terms" for information on usage and redistribution
  * of this file.
  */
@@ -15,12 +19,6 @@
 #include <pthread.h>
 #include "repsemaphore.h"
 
-#if !defined(HAVE_PTHREAD_YIELD) && defined(HAVE_SCHED_YIELD)
-#if defined(HAVE_SCHED_H)
-#include <sched.h>
-#endif // SCHED_H
-#endif // SCHED_YIELD && !PTHREAD_YIELD
-
 #include "gtypes.h"
 #include "threadData.h"
 #include "debug.h"
@@ -266,15 +264,7 @@
  * yield.
  *
  */
-static inline
-void jthread_yield (void)
-{
-#if defined(HAVE_PTHREAD_YIELD)
-  pthread_yield();
-#elif defined(HAVE_SCHED_YIELD)
-  sched_yield();
-#endif
-}
+void jthread_yield (void);
 
 /**
  * Acquire a spin lock.
Index: kaffe/libraries/clib/libxmlj/Makefile.am
diff -u kaffe/libraries/clib/libxmlj/Makefile.am:1.6 kaffe/libraries/clib/libxmlj/Makefile.am:1.7
--- kaffe/libraries/clib/libxmlj/Makefile.am:1.6	Sun Jan 23 18:48:39 2005
+++ kaffe/libraries/clib/libxmlj/Makefile.am	Sat Feb  5 19:42:12 2005
@@ -44,10 +44,12 @@
 	-pedantic \
 	-Wall \
 	-fbounds-check \
+        $(PTHREAD_CFLAGS) \
 	$(CFLAGS_PG)
 
 libxmlj_la_LDFLAGS = \
         $(KLIBFLAGS) \
+        $(PTHREAD_LIBS) \
         -module \
 	-export-dynamic \
         -release $(PACKAGE_VERSION)
Index: kaffe/libraries/clib/libxmlj/Makefile.in
diff -u kaffe/libraries/clib/libxmlj/Makefile.in:1.36 kaffe/libraries/clib/libxmlj/Makefile.in:1.37
--- kaffe/libraries/clib/libxmlj/Makefile.in:1.36	Sat Feb  5 17:47:26 2005
+++ kaffe/libraries/clib/libxmlj/Makefile.in	Sat Feb  5 19:42:12 2005
@@ -421,10 +421,12 @@
 	-pedantic \
 	-Wall \
 	-fbounds-check \
+        $(PTHREAD_CFLAGS) \
 	$(CFLAGS_PG)
 
 libxmlj_la_LDFLAGS = \
         $(KLIBFLAGS) \
+        $(PTHREAD_LIBS) \
         -module \
 	-export-dynamic \
         -release $(PACKAGE_VERSION)

