[kaffe] CVS kaffe (dalibor): Fixed arm-linux build problems
Kaffe CVS
cvs-commits at kaffe.org
Sun Jun 27 18:02:28 PDT 2004
PatchSet 4876
Date: 2004/06/28 00:20:34
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed arm-linux build problems
2004-06-27 Dalibor Topic <robilad at kaffe.org>
* config/arm/linux/sigcontextinfo.h:
Fixed compilation problems with not matching
sigcontext and k_sigcontext structs.
* config/arm/sysdepCallMethod.h:
(sysdepCallMethod) Removed bogus clobbered
constraints. Fixes build with gcc 3.4.0.
* config/arm/linux/armsigctx.h,
config/arm/linux/kernel-features.h:
Removed.
Reported by: Fabien Renaud <renaud at nentec.de>
Members:
ChangeLog:1.2442->1.2443
config/arm/sysdepCallMethod.h:1.3->1.4
config/arm/linux/armsigctx.h:1.1->1.2(DEAD)
config/arm/linux/kernel-features.h:1.1->1.2(DEAD)
config/arm/linux/sigcontextinfo.h:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2442 kaffe/ChangeLog:1.2443
--- kaffe/ChangeLog:1.2442 Sun Jun 27 16:35:09 2004
+++ kaffe/ChangeLog Mon Jun 28 00:20:34 2004
@@ -1,5 +1,21 @@
2004-06-27 Dalibor Topic <robilad at kaffe.org>
+ * config/arm/linux/sigcontextinfo.h:
+ Fixed compilation problems with not matching
+ sigcontext and k_sigcontext structs.
+
+ * config/arm/sysdepCallMethod.h:
+ (sysdepCallMethod) Removed bogus clobbered
+ constraints. Fixes build with gcc 3.4.0.
+
+ * config/arm/linux/armsigctx.h,
+ config/arm/linux/kernel-features.h:
+ Removed.
+
+ Reported by: Fabien Renaud <renaud at nentec.de>
+
+2004-06-27 Dalibor Topic <robilad at kaffe.org>
+
* kaffe/kaffevm/mem/gc-mem.c:
Added includes for mprotect on NetBSD 1.5.x.
Index: kaffe/config/arm/sysdepCallMethod.h
diff -u kaffe/config/arm/sysdepCallMethod.h:1.3 kaffe/config/arm/sysdepCallMethod.h:1.4
--- kaffe/config/arm/sysdepCallMethod.h:1.3 Tue Jun 22 15:07:57 2004
+++ kaffe/config/arm/sysdepCallMethod.h Mon Jun 28 00:20:37 2004
@@ -63,7 +63,7 @@
: "=r" (r0), "=r" (r1), "=f" (f0)
: "r" (call->function),
"0" (r0), "1" (r1), "r" (r2), "r" (r3)
- : "ip", "rfp", "sl", "fp", "lr");
+ : "ip", "lr");
switch (call->rettype)
{
case 'V':
===================================================================
Checking out kaffe/config/arm/linux/armsigctx.h
RCS: /home/cvs/kaffe/kaffe/config/arm/linux/Attic/armsigctx.h,v
VERS: 1.1
***************
--- kaffe/config/arm/linux/armsigctx.h Mon Jun 28 01:02:27 2004
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,73 +0,0 @@
-/* Definition of `struct sigcontext' for Linux/ARM
- Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-/* The format of struct sigcontext changed between 2.0 and 2.1 kernels.
- Fortunately 2.0 puts a magic number in the first word and this is not
- a legal value for `trap_no', so we can tell them apart. */
-
-/* Early 2.2 and 2.3 kernels do not have the `fault_address' member in
- the sigcontext structure. Unfortunately there is no reliable way
- to test for its presence and this word will contain garbage for too-old
- kernels. Versions 2.2.14 and 2.3.35 (plus later versions) are known to
- include this element. */
-
-#ifndef __ARMSIGCTX_H
-#define __ARMSIGCTX_H 1
-
-#include <asm/ptrace.h>
-
-union k_sigcontext
- {
- struct
- {
- unsigned long int trap_no;
- unsigned long int error_code;
- unsigned long int oldmask;
- unsigned long int arm_r0;
- unsigned long int arm_r1;
- unsigned long int arm_r2;
- unsigned long int arm_r3;
- unsigned long int arm_r4;
- unsigned long int arm_r5;
- unsigned long int arm_r6;
- unsigned long int arm_r7;
- unsigned long int arm_r8;
- unsigned long int arm_r9;
- unsigned long int arm_r10;
- unsigned long int arm_fp;
- unsigned long int arm_ip;
- unsigned long int arm_sp;
- unsigned long int arm_lr;
- unsigned long int arm_pc;
- unsigned long int arm_cpsr;
- unsigned long fault_address;
- } v21;
- struct
- {
- unsigned long int magic;
- struct pt_regs reg;
- unsigned long int trap_no;
- unsigned long int error_code;
- unsigned long int oldmask;
- } v20;
-};
-
-#define SIGCONTEXT_2_0_MAGIC 0x4B534154
-
-#endif /* bits/armsigctx.h */
===================================================================
Checking out kaffe/config/arm/linux/kernel-features.h
RCS: /home/cvs/kaffe/kaffe/config/arm/linux/Attic/kernel-features.h,v
VERS: 1.1
***************
--- kaffe/config/arm/linux/kernel-features.h Mon Jun 28 01:02:27 2004
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,266 +0,0 @@
-/* Set flags signalling availability of kernel features based on given
- kernel version number.
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-/* This file must not contain any C code. At least it must be protected
- to allow using the file also in assembler files. */
-
-#ifndef __LINUX_KERNEL_VERSION
-/* We assume the worst; all kernels should be supported. */
-# define __LINUX_KERNEL_VERSION 0
-#endif
-
-/* We assume for __LINUX_KERNEL_VERSION the same encoding used in
- linux/version.h. I.e., the major, minor, and subminor all get a
- byte with the major number being in the highest byte. This means
- we can do numeric comparisons.
-
- In the following we will define certain symbols depending on
- whether the describes kernel feature is available in the kernel
- version given by __LINUX_KERNEL_VERSION. We are not always exactly
- recording the correct versions in which the features were
- introduced. If somebody cares these values can afterwards be
- corrected. Most of the numbers here are set corresponding to
- 2.2.0. */
-
-/* `getcwd' system call. */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_GETCWD_SYSCALL 1
-#endif
-
-/* Real-time signal became usable in 2.1.70. */
-#if __LINUX_KERNEL_VERSION >= 131398
-# define __ASSUME_REALTIME_SIGNALS 1
-#endif
-
-/* When were the `pread'/`pwrite' syscalls introduced? */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_PREAD_SYSCALL 1
-# define __ASSUME_PWRITE_SYSCALL 1
-#endif
-
-/* When was `poll' introduced? */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_POLL_SYSCALL 1
-#endif
-
-/* The `lchown' syscall was introduced in 2.1.80. */
-#if __LINUX_KERNEL_VERSION >= 131408
-# define __ASSUME_LCHOWN_SYSCALL 1
-#endif
-
-/* When did the `setresuid' sysall became available? */
-#if __LINUX_KERNEL_VERSION >= 131584 && !defined __sparc__
-# define __ASSUME_SETRESUID_SYSCALL 1
-#endif
-
-/* The SIOCGIFNAME ioctl is available starting with 2.1.50. */
-#if __LINUX_KERNEL_VERSION >= 131408
-# define __ASSUME_SIOCGIFNAME 1
-#endif
-
-/* On x86 another `getrlimit' syscall was added in 2.3.25. */
-#if __LINUX_KERNEL_VERSION >= 131865 && defined __i386__
-# define __ASSUME_NEW_GETRLIMIT_SYSCALL 1
-#endif
-
-/* On x86 the truncate64/ftruncate64 syscalls were introduced in 2.3.31. */
-#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__
-# define __ASSUME_TRUNCATE64_SYSCALL 1
-#endif
-
-/* On x86 the mmap2 syscall was introduced in 2.3.31. */
-#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__
-# define __ASSUME_MMAP2_SYSCALL 1
-#endif
-
-/* On x86 the stat64/lstat64/fstat64 syscalls were introduced in 2.3.34. */
-#if __LINUX_KERNEL_VERSION >= 131874 && defined __i386__
-# define __ASSUME_STAT64_SYSCALL 1
-#endif
-
-/* On sparc and ARM the truncate64/ftruncate64/mmap2/stat64/lstat64/fstat64
- syscalls were introduced in 2.3.35. */
-#if __LINUX_KERNEL_VERSION >= 131875 && (defined __sparc__ || defined __arm__)
-# define __ASSUME_TRUNCATE64_SYSCALL 1
-# define __ASSUME_MMAP2_SYSCALL 1
-# define __ASSUME_STAT64_SYSCALL 1
-#endif
-
-/* I know for sure that getrlimit are in 2.3.35 on powerpc. */
-#if __LINUX_KERNEL_VERSION >= 131875 && defined __powerpc__
-# define __ASSUME_NEW_GETRLIMIT_SYSCALL 1
-#endif
-
-/* I know for sure that these are in 2.3.35 on powerpc. But PowerPC64 does not
- support separate 64-bit syscalls, already 64-bit */
-#if __LINUX_KERNEL_VERSION >= 131875 && defined __powerpc__ \
- && !defined __powerpc64__
-# define __ASSUME_TRUNCATE64_SYSCALL 1
-# define __ASSUME_STAT64_SYSCALL 1
-#endif
-
-/* Linux 2.3.39 introduced 32bit UID/GIDs. Some platforms had 32
- bit type all along. */
-#if __LINUX_KERNEL_VERSION >= 131879 || defined __powerpc__ || defined __mips__
-# define __ASSUME_32BITUIDS 1
-#endif
-
-/* Linux 2.3.39 sparc added setresuid. */
-#if __LINUX_KERNEL_VERSION >= 131879 && defined __sparc__
-# define __ASSUME_SETRESUID_SYSCALL 1
-#endif
-
-/* Linux 2.3.39 introduced IPC64. Except for powerpc. */
-#if __LINUX_KERNEL_VERSION >= 131879 && !defined __powerpc__
-# define __ASSUME_IPC64 1
-#endif
-
-/* mips platforms had IPC64 all along. */
-#if defined __mips__
-# define __ASSUME_IPC64 1
-#endif
-
-/* Linux 2.4.0 on PPC introduced a correct IPC64. But PowerPC64 does not
- support a separate 64-bit sys call, already 64-bit */
-#if __LINUX_KERNEL_VERSION >= 132096 && defined __powerpc__ \
- && !defined __powerpc64__
-# define __ASSUME_IPC64 1
-#endif
-
-/* We can use the LDTs for threading with Linux 2.3.99 and newer. */
-#if __LINUX_KERNEL_VERSION >= 131939
-# define __ASSUME_LDT_WORKS 1
-#endif
-
-/* The changed st_ino field appeared in 2.4.0-test6. But we cannot
- distinguish this version from other 2.4.0 releases. Therefore play
- save and assume it available is for 2.4.1 and up. */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_ST_INO_64_BIT 1
-#endif
-
-/* To support locking of large files a new fcntl() syscall was introduced
- in 2.4.0-test7. We test for 2.4.1 for the earliest version we know
- the syscall is available. */
-#if __LINUX_KERNEL_VERSION >= 132097 && (defined __i386__ || defined __sparc__)
-# define __ASSUME_FCNTL64 1
-#endif
-
-/* Arm got fcntl64 in 2.4.4, PowerPC and SH have it also in 2.4.4 (I
- don't know when it got introduced). But PowerPC64 does not support
- separate FCNTL64 call, FCNTL is already 64-bit */
-#if __LINUX_KERNEL_VERSION >= 132100 \
- && (defined __arm__ || defined __powerpc__ || defined __sh__) \
- && !defined __powerpc64__
-# define __ASSUME_FCNTL64 1
-#endif
-
-/* The getdents64 syscall was introduced in 2.4.0-test7. We test for
- 2.4.1 for the earliest version we know the syscall is available. */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_GETDENTS64_SYSCALL 1
-#endif
-
-/* When did O_DIRECTORY became available? Early in 2.3 but when?
- Be safe, use 2.3.99. */
-#if __LINUX_KERNEL_VERSION >= 131939
-# define __ASSUME_O_DIRECTORY 1
-#endif
-
-/* Starting with one of the 2.4.0 pre-releases the Linux kernel passes
- up the page size information. */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_AT_PAGESIZE 1
-#endif
-
-/* Starting with at least 2.4.0 the kernel passes the uid/gid unconditionally
- up to the child. */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_AT_XID 1
-#endif
-
-/* Starting with 2.4.5 kernels PPC passes the AUXV in the standard way
- and the vfork syscall made it into the official kernel. */
-#if __LINUX_KERNEL_VERSION >= (132096+5) && defined __powerpc__
-# define __ASSUME_STD_AUXV 1
-# define __ASSUME_VFORK_SYSCALL 1
-#endif
-
-/* Starting with 2.4.5 kernels the mmap2 syscall made it into the official
- kernel. But PowerPC64 does not support a separate MMAP2 call. */
-#if __LINUX_KERNEL_VERSION >= (132096+5) && defined __powerpc__ \
- && !defined __powerpc64__
-# define __ASSUME_MMAP2_SYSCALL 1
-#endif
-
-/* Starting with 2.4.21 PowerPC implements the new prctl syscall.
- This allows applications to get/set the Floating Point Exception Mode. */
-#if __LINUX_KERNEL_VERSION >= (132096+21) && defined __powerpc__
-# define __ASSUME_NEW_PRCTL_SYSCALL 1
-#endif
-
-/* Starting with 2.4.21 PowerPC64 implements the new rt_sigreturn syscall.
- The new rt_sigreturn takes an ucontext pointer allowing rt_sigreturn
- to be used in the set/swapcontext implementation. */
-#if __LINUX_KERNEL_VERSION >= (132096+21) && defined __powerpc64__
-# define __ASSUME_NEW_RT_SIGRETURN_SYSCALL 1
-#endif
-
-/* On x86, the set_thread_area syscall was introduced in 2.5.29, but its
- semantics was changed in 2.5.30, and again after 2.5.31. */
-#if __LINUX_KERNEL_VERSION >= 132384 && defined __i386__
-# define __ASSUME_SET_THREAD_AREA_SYSCALL 1
-#endif
-
-/* The vfork syscall on x86 was definitely available in 2.4. */
-#if __LINUX_KERNEL_VERSION >= 132097 && defined __i386__
-# define __ASSUME_VFORK_SYSCALL 1
-#endif
-
-/* There are an infinite number of PA-RISC kernel versions numbered
- 2.4.0. But they've not really been released as such. We require
- and expect the final version here. */
-#ifdef __hppa__
-# define __ASSUME_32BITUIDS 1
-# define __ASSUME_TRUNCATE64_SYSCALL 1
-# define __ASSUME_MMAP2_SYSCALL 1
-# define __ASSUME_STAT64_SYSCALL 1
-# define __ASSUME_IPC64 1
-# define __ASSUME_ST_INO_64_BIT 1
-# define __ASSUME_FCNTL64 1
-# define __ASSUME_GETDENTS64_SYSCALL 1
-#endif
-
-/* The late 2.5 kernels saw a lot of new CLONE_* flags. Summarize
- their availability with one define. The changes were made first
- for i386 and the have to be done separately for the other archs.
- For i386 we pick 2.5.50 as the first version with support. */
-#if __LINUX_KERNEL_VERSION >= 132402 && defined __i386__
-# define __ASSUME_CLONE_THREAD_FLAGS 1
-#endif
-
-/* These features were surely available with 2.4.12. */
-#if __LINUX_KERNEL_VERSION >= 132108 && defined __mc68000__
-# define __ASSUME_MMAP2_SYSCALL 1
-# define __ASSUME_TRUNCATE64_SYSCALL 1
-# define __ASSUME_STAT64_SYSCALL 1
-# define __ASSUME_FCNTL64 1
-# define __ASSUME_VFORK_SYSCALL 1
-#endif
Index: kaffe/config/arm/linux/sigcontextinfo.h
diff -u kaffe/config/arm/linux/sigcontextinfo.h:1.2 kaffe/config/arm/linux/sigcontextinfo.h:1.3
--- kaffe/config/arm/linux/sigcontextinfo.h:1.2 Wed Jun 9 17:40:15 2004
+++ kaffe/config/arm/linux/sigcontextinfo.h Mon Jun 28 00:20:37 2004
@@ -17,32 +17,21 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include "armsigctx.h"
-#include "kernel-features.h"
-
-#define SIGCONTEXT int _a2, int _a3, int _a4, union k_sigcontext
+#define SIGCONTEXT int _a2, int _a3, int _a4, struct sigcontext
#define SIGCONTEXT_EXTRA_ARGS _a2, _a3, _a4,
/* The sigcontext structure changed between 2.0 and 2.1 kernels. On any
modern system we should be able to assume that the "new" format will be
in use. */
-#if __LINUX_KERNEL_VERSION > 131328
-
-#define GET_PC(ctx) ((void *) ctx.v21.arm_pc)
-#define GET_FRAME(ctx) ADVANCE_STACK_FRAME ((void *) ctx.v21.arm_fp)
-#define GET_STACK(ctx) ((void *) ctx.v21.arm_sp)
-
-#else
-
-#define GET_PC(ctx) ((void *)((ctx.v20.magic == SIGCONTEXT_2_0_MAGIC) ? \
- ctx.v20.reg.ARM_pc : ctx.v21.arm_pc))
-#define GET_FRAME(ctx) \
- ADVANCE_STACK_FRAME((void *)((ctx.v20.magic == SIGCONTEXT_2_0_MAGIC) ? \
- ctx.v20.reg.ARM_fp : ctx.v21.arm_fp))
-#define GET_STACK(ctx) ((void *)((ctx.v20.magic == SIGCONTEXT_2_0_MAGIC) ? \
- ctx.v20.reg.ARM_sp : ctx.v21.arm_sp))
-#endif
+/* Kaffe supports just the new format. If you are stuck on an arm where you
+ get compile errors, post an e-mail to the mailing list, and we'll try
+ to come up with a configure test top automatically detect such beasts.
+*/
+
+#define GET_PC(ctx) ((void *) ctx.arm_pc)
+#define GET_FRAME(ctx) ADVANCE_STACK_FRAME ((void *) ctx.arm_fp)
+#define GET_STACK(ctx) ((void *) ctx.arm_sp)
#define ADVANCE_STACK_FRAME(frm) \
((struct layout *)frm - 1)
More information about the kaffe
mailing list