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

[Kaffe CVS]

PatchSet 4899 
Date: 2004/07/06 20:48:32
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed build on x86_64-linux

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

        * config/x86_64/linux/sigcontextinfo.h: Cleaned up.
        (GET_PC, GET_STACK, GET_FRAME) Use fields from sigcontext.

        * kaffe/kaffe/main.c:
        (options) Removed const from propStr declaration to fix
        the build on x86_64-linux.

Members: 
	ChangeLog:1.2465->1.2466 
	config/x86_64/linux/sigcontextinfo.h:1.1->1.2 
	kaffe/kaffe/main.c:1.59->1.60 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2465 kaffe/ChangeLog:1.2466
--- kaffe/ChangeLog:1.2465	Tue Jul  6 17:16:01 2004
+++ kaffe/ChangeLog	Tue Jul  6 20:48:32 2004
@@ -1,5 +1,14 @@
 2004-07-06  Dalibor Topic  <robilad at kaffe.org>
 
+        * config/x86_64/linux/sigcontextinfo.h: Cleaned up.
+	(GET_PC, GET_STACK, GET_FRAME) Use fields from sigcontext.
+
+        * kaffe/kaffe/main.c:
+	(options) Removed const from propStr declaration to fix 
+	the build on x86_64-linux.
+
+2004-07-06  Dalibor Topic  <robilad at kaffe.org>
+
         * config/sparc/linux/jit-md.h:
 	(EXCEPTIONFRAME) Use generic GET_PC and 
 	GET_STACK macros from glibc that work on both sparc 
Index: kaffe/config/x86_64/linux/sigcontextinfo.h
diff -u kaffe/config/x86_64/linux/sigcontextinfo.h:1.1 kaffe/config/x86_64/linux/sigcontextinfo.h:1.2
--- kaffe/config/x86_64/linux/sigcontextinfo.h:1.1	Mon Jun  7 19:14:26 2004
+++ kaffe/config/x86_64/linux/sigcontextinfo.h	Tue Jul  6 20:48:34 2004
@@ -16,11 +16,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define SIGCONTEXT struct ucontext
-#define SIGCONTEXT_EXTRA_ARGS
-#define GET_PC(ctx)	((void *) (ctx).uc_mcontext.gregs[REG_RIP])
-#define GET_FRAME(ctx)	((void *) (ctx).uc_mcontext.gregs[REG_RBP])
-#define GET_STACK(ctx)	((void *) (ctx).uc_mcontext.gregs[REG_RSP])
-
-#define CALL_SIGHANDLER(handler, signo, ctx) \
-  (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx))
+#define GET_PC(ctx)	((void *) (ctx).rip)
+#define GET_FRAME(ctx)	((void *) (ctx).rbp)
+#define GET_STACK(ctx)	((void *) (ctx).rsp)
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.59 kaffe/kaffe/kaffe/main.c:1.60
--- kaffe/kaffe/kaffe/main.c:1.59	Tue Jul  6 16:26:41 2004
+++ kaffe/kaffe/kaffe/main.c	Tue Jul  6 20:48:34 2004
@@ -674,7 +674,7 @@
 #endif
 		else if (argv[i][1] ==  'D') {
 			/* Set a property */
-			const char *propStr = strdup(&argv[i][2]);
+			char *propStr = strdup(&argv[i][2]);
 			
 			prop = malloc(sizeof(userProperty));
 			assert(prop != 0);