[kaffe] CVS kaffe (dalibor): Fixed build on alpha-linux

Kaffe CVS cvs-commits at kaffe.org
Tue Jun 29 06:14:05 PDT 2004


PatchSet 4880 
Date: 2004/06/29 13:06:53
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed build on alpha-linux

2004-06-29  Dalibor Topic  <robilad at kaffe.org>

        * config/alpha/linux/md.h:
        (GET_SIGNAL_CONTEXT_POINTER) Fixed build on
        alpha-linux. SIGNAL_ARGS says sigcontext is a
        pointer so there is no need to take its address.

        * kaffe/kaffevm/systems/unix-jthreads/Makefile.am,
        kaffe/kaffevm/systems/unix-pthreads/Makefile.am,
        kaffe/kaffevm/verifier/Makefile.am:
        (AM_CPPFLAGS) Added missing include directories to
        fix build with CPPFLAGS=-H.

        * kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
        kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
        kaffe/kaffevm/verifier/Makefile.in:
        Regenerated.

Members: 
	ChangeLog:1.2446->1.2447 
	config/alpha/linux/md.h:1.5->1.6 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.13->1.14 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.103->1.104 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.8->1.9 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.74->1.75 
	kaffe/kaffevm/verifier/Makefile.am:1.2->1.3 
	kaffe/kaffevm/verifier/Makefile.in:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2446 kaffe/ChangeLog:1.2447
--- kaffe/ChangeLog:1.2446	Mon Jun 28 21:14:32 2004
+++ kaffe/ChangeLog	Tue Jun 29 13:06:53 2004
@@ -1,3 +1,21 @@
+2004-06-29  Dalibor Topic  <robilad at kaffe.org>
+
+        * config/alpha/linux/md.h:
+	(GET_SIGNAL_CONTEXT_POINTER) Fixed build on 
+	alpha-linux. SIGNAL_ARGS says sigcontext is a 
+	pointer so there is no need to take its address.
+
+        * kaffe/kaffevm/systems/unix-jthreads/Makefile.am,
+        kaffe/kaffevm/systems/unix-pthreads/Makefile.am,
+        kaffe/kaffevm/verifier/Makefile.am:
+	(AM_CPPFLAGS) Added missing include directories to
+	fix build with CPPFLAGS=-H.
+
+        * kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+        kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+        kaffe/kaffevm/verifier/Makefile.in:
+	Regenerated.
+
 2004-06-28  Rob Gonzalez <rob at kaffe.org>
 	* kaffe/kaffevm/verifier/verify-types.h
 	* kaffe/kaffevm/verifier/verify-types.c
Index: kaffe/config/alpha/linux/md.h
diff -u kaffe/config/alpha/linux/md.h:1.5 kaffe/config/alpha/linux/md.h:1.6
--- kaffe/config/alpha/linux/md.h:1.5	Mon Jun  7 19:14:15 2004
+++ kaffe/config/alpha/linux/md.h	Tue Jun 29 13:06:55 2004
@@ -26,7 +26,7 @@
 
 #define SIGNAL_ARGS(sig, sc) int sig, int alpha_dummy, struct sigcontext *sc
 #define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext * scp
-#define GET_SIGNAL_CONTEXT_POINTER(sc) (&sc)
+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
 #define SIGNAL_PC(scp) (GET_PC((*scp)))
 #define STACK_POINTER(scp) (GET_STACK((*scp)))
 
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.am
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.13 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.14
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.13	Tue Jun 22 15:35:46 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.am	Tue Jun 29 13:06:55 2004
@@ -18,10 +18,16 @@
 @engine_frag@
 
 AM_CPPFLAGS = \
-	-I. -I$(srcdir) -I../.. -I$(srcdir)/../.. \
+	-I. \
+	-I$(srcdir) \
+	-I../.. \
+	-I$(srcdir)/../.. \
 	-I$(top_srcdir)/kaffe/kaffevm/jni \
-	-I$(top_builddir)/config -I$(top_srcdir)/config \
-	-I$(top_builddir)/include -I$(top_srcdir)/include \
+	-I$(top_builddir)/config \
+	-I$(top_srcdir)/config \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/kaffe/xprof \
 	-I$(top_builddir)/include \
+	$(ENGINE_INCLUDES) \
 	$(ENGINE_DEFS)
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.103 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.104
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.103	Wed Jun 23 09:11:48 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in	Tue Jun 29 13:06:55 2004
@@ -346,12 +346,18 @@
 		lock-impl.h thread-impl.h jqueue.h
 
 AM_CPPFLAGS = \
-	-I. -I$(srcdir) -I../.. -I$(srcdir)/../.. \
+	-I. \
+	-I$(srcdir) \
+	-I../.. \
+	-I$(srcdir)/../.. \
 	-I$(top_srcdir)/kaffe/kaffevm/jni \
-	-I$(top_builddir)/config -I$(top_srcdir)/config \
-	-I$(top_builddir)/include -I$(top_srcdir)/include \
+	-I$(top_builddir)/config \
+	-I$(top_srcdir)/config \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/kaffe/xprof \
 	-I$(top_builddir)/include \
+	$(ENGINE_INCLUDES) \
 	$(ENGINE_DEFS)
 
 all: all-am
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.8 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.9
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.8	Tue Jun 22 15:35:47 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am	Tue Jun 29 13:06:57 2004
@@ -24,9 +24,15 @@
 @engine_frag@
 
 AM_CPPFLAGS = \
-	-I. -I$(srcdir) -I../.. -I$(srcdir)/../.. \
+	-I. \
+	-I$(srcdir) \
+	-I../.. \
+	-I$(srcdir)/../.. \
 	-I$(top_srcdir)/kaffe/kaffevm/jni \
-	-I$(top_builddir)/config -I$(top_srcdir)/config \
-	-I$(top_builddir)/include -I$(top_srcdir)/include \
+	-I$(top_builddir)/config \
+	-I$(top_srcdir)/config \
 	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	$(ENGINE_INCUDES) \
 	$(ENGINE_DEFS)
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.74 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.75
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.74	Wed Jun 23 09:11:48 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in	Tue Jun 29 13:06:57 2004
@@ -353,11 +353,17 @@
 		jsignal.h jthread.h
 
 AM_CPPFLAGS = \
-	-I. -I$(srcdir) -I../.. -I$(srcdir)/../.. \
+	-I. \
+	-I$(srcdir) \
+	-I../.. \
+	-I$(srcdir)/../.. \
 	-I$(top_srcdir)/kaffe/kaffevm/jni \
-	-I$(top_builddir)/config -I$(top_srcdir)/config \
-	-I$(top_builddir)/include -I$(top_srcdir)/include \
+	-I$(top_builddir)/config \
+	-I$(top_srcdir)/config \
 	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	$(ENGINE_INCUDES) \
 	$(ENGINE_DEFS)
 
 all: all-am
Index: kaffe/kaffe/kaffevm/verifier/Makefile.am
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.am:1.2 kaffe/kaffe/kaffevm/verifier/Makefile.am:1.3
--- kaffe/kaffe/kaffevm/verifier/Makefile.am:1.2	Tue Jun 22 15:35:47 2004
+++ kaffe/kaffe/kaffevm/verifier/Makefile.am	Tue Jun 29 13:06:57 2004
@@ -7,8 +7,11 @@
 # of this file. 
 
 AM_CPPFLAGS = \
+        -I$(top_srcdir)/include \
+        -I$(top_srcdir)/kaffe/kaffevm/jni \
+        -I$(top_builddir)/config \
+        -I$(top_srcdir)/config \
 	-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
-	-I$(top_srcdir)/kaffe/kaffevm/jni \
 	$(ENGINE_INCLUDES) \
 	-I$(top_srcdir)/libltdl \
 	$(ENGINE_DEFS) \
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.3 kaffe/kaffe/kaffevm/verifier/Makefile.in:1.4
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.3	Wed Jun 23 09:11:48 2004
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in	Tue Jun 29 13:06:57 2004
@@ -344,8 +344,11 @@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
 AM_CPPFLAGS = \
+        -I$(top_srcdir)/include \
+        -I$(top_srcdir)/kaffe/kaffevm/jni \
+        -I$(top_builddir)/config \
+        -I$(top_srcdir)/config \
 	-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
-	-I$(top_srcdir)/kaffe/kaffevm/jni \
 	$(ENGINE_INCLUDES) \
 	-I$(top_srcdir)/libltdl \
 	$(ENGINE_DEFS) \




More information about the kaffe mailing list