[kaffe] CVS kaffe (riccardo): include config.h and reconginse POWER cpu

Kaffe CVS cvs-commits at kaffe.org
Sun Dec 25 18:06:47 PST 2005


PatchSet 7055 
Date: 2005/12/26 02:00:14
Author: riccardo
Branch: HEAD
Tag: (none) 
Log:
include config.h and reconginse POWER cpu

Members: 
	ChangeLog:1.4573->1.4574 
	config/config-io.h:INITIAL->1.8 
	config/config-math.h:1.4->1.5 
	config/config-mem.h:INITIAL->1.11 
	config/config-net.h:1.3->1.4 
	config/config-setjmp.h:1.8->1.9 
	config/config-signal.h:INITIAL->1.5 
	config/config.alias:1.23->1.24 
	config/powerpc/atomic.h:1.3->1.4 
	config/powerpc/bits/atomic.h:1.1->1.2 
	libraries/javalib/external/classpath/native/fdlibm/ieeefp.h:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4573 kaffe/ChangeLog:1.4574
--- kaffe/ChangeLog:1.4573	Mon Dec 26 01:49:19 2005
+++ kaffe/ChangeLog	Mon Dec 26 02:00:14 2005
@@ -1,4 +1,18 @@
 2005-12-26  Riccardo Mottola  <riccardo at kaffe.org>
+	* config/config-io.h,
+	config/config-math.h,
+	config/config-mem.h,
+	config/config-net.h,
+	config/config-setjmp.h,
+	config/config-signal.h:
+	added include of config.h
+
+	* config/config.alias,
+	config/powerpc/atomic.h,
+	config/powerpc/bits/atomic.h:
+	added support for POWER cpu
+
+2005-12-26  Riccardo Mottola  <riccardo at kaffe.org>
 	* config/sparc/atomic-sparc32v9.h, config/sparc/atomic-sparc64.h:
 	fix includes
 	* config/sparc/common.h:
===================================================================
Checking out kaffe/config/config-io.h
RCS:  /home/cvs/kaffe/kaffe/config/config-io.h,v
VERS: 1.8
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/config/config-io.h	Mon Dec 26 02:06:47 2005
@@ -0,0 +1,89 @@
+/*
+ * config-io.h
+ *
+ * Copyright (c) 1996, 1997
+ *	Transvirtual Technologies, Inc.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ */
+
+#include "config.h"
+
+#ifndef __config_io_h
+#define __config_io_h
+
+
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+#if defined(HAVE_POLL_H)
+#include <poll.h>
+#endif
+#if defined(HAVE_SYS_POLL_H)
+#include <sys/poll.h>
+#endif
+#if defined(HAVE_SYS_SELECT_H)
+#include <sys/select.h>
+#endif
+#if defined(HAVE_SYS_SOCKET_H)
+#include <sys/socket.h>
+#endif
+#if defined(HAVE_SYS_IOCTL_H)
+#include <sys/ioctl.h>
+#endif
+#if defined(HAVE_IO_H)
+#include <io.h>
+#endif
+#if defined(HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+#if defined(HAVE_SYS_FILIO_H)
+#include <sys/filio.h>
+#endif
+#if defined(HAVE_SYS_STAT_H)
+#include <sys/stat.h>
+#endif
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
+
+#if defined(HAVE_DIRENT_H)
+# include <dirent.h>
+# define NAMLEN(dirent) (strlen((dirent)->d_name))
+#elif defined(HAVE_SYS_NDIR_H) || defined(HAVE_NDIR_H) || defined(HAVE_SYS_DIR_H)
+# define dirent direct
+# define NAMLEN(dirent) ((dirent)->d_namlen)
+# if defined(HAVE_SYS_NDIR_H)
+#  include <sys/ndir.h>
+# endif
+# if defined(HAVE_NDIR_H)
+#  include <ndir.h>
+# endif
+# if defined(HAVE_SYS_DIR_H)
+#  include <sys/dir.h>
+# endif
+#endif
+
+#if !defined(S_ISDIR)
+#define	S_ISDIR(m)	((m) & S_IFDIR)
+#endif
+#if !defined(S_ISREG)
+#define	S_ISREG(m)	((m) & S_IFREG)
+#endif
+
+#if !defined(SEEK_SET)
+#define	SEEK_SET	0
+#define	SEEK_CUR	1
+#define	SEEK_END	2
+#endif
+
+#if !defined(O_BINARY)
+#define	O_BINARY	0
+#endif
+
+#if !defined(FD_COPY)
+#define	FD_COPY(a, b)	memcpy(b, a, sizeof(*(b)))
+#endif
+
+#endif
Index: kaffe/config/config-math.h
diff -u kaffe/config/config-math.h:1.4 kaffe/config/config-math.h:1.5
--- kaffe/config/config-math.h:1.4	Wed Jul 28 00:13:06 1999
+++ kaffe/config/config-math.h	Mon Dec 26 02:00:19 2005
@@ -8,6 +8,8 @@
  * of this file. 
  */
 
+#include "config.h"
+
 #ifndef __config_math_h
 #define __config_math_h
 
===================================================================
Checking out kaffe/config/config-mem.h
RCS:  /home/cvs/kaffe/kaffe/config/config-mem.h,v
VERS: 1.11
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/config/config-mem.h	Mon Dec 26 02:06:47 2005
@@ -0,0 +1,77 @@
+/*
+ * config-mem.h
+ *
+ * Copyright (c) 1996, 1997
+ *	Transvirtual Technologies, Inc.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ */
+
+#include "config.h"
+
+#ifndef __config_mem_h
+#define __config_mem_h
+
+
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#endif
+
+#if defined(HAVE_STDLIB_H)
+# include <stdlib.h>
+#else /* !HAVE_STDLIB_H */
+# if defined(HAVE_MALLOC_H)
+#  include <malloc.h>
+# endif /* HAVE_MALLOC_H */
+#endif /* HAVE_STDLIB_H */
+
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#endif
+
+#if defined(HAVE_MEMORY_H)
+#include <memory.h>
+#endif
+
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif /* defined(HAVE_SYS_TYPES_H) */
+
+#if defined(HAVE_SYS_MMAN_H)
+#include <sys/mman.h>
+#endif /* defined(HAVE_SYS_MMAN_H) */
+
+#if !defined(HAVE_MEMCPY)
+void bcopy(void*, void*, size_t);
+#define	memcpy(_d, _s, _n)	bcopy((_s), (_d), (_n))
+#endif
+
+#if !defined(HAVE_MEMMOVE)
+/* use bcopy instead */
+#define memmove(to,from,size)	bcopy((from),(to),(size))
+#endif
+
+#if !defined(HAVE_GETPAGESIZE)
+#define	getpagesize()	8192
+#endif
+
+#if !defined(HAVE_DECLARED_SWAB)
+
+/*
+ * Linux 2.0 systems apparently put ssize_t in sys/types.h
+ */
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
+/* 
+ * Some systems (Linux) do not declare swab in any standard header file
+ */
+/*
+extern void swab(const void *from, void *to, size_t n);
+*/
+extern void swab(const void *from, void *to, ssize_t n);
+#endif
+
+#endif
Index: kaffe/config/config-net.h
diff -u kaffe/config/config-net.h:1.3 kaffe/config/config-net.h:1.4
--- kaffe/config/config-net.h:1.3	Sun Jul 17 20:39:03 2005
+++ kaffe/config/config-net.h	Mon Dec 26 02:00:19 2005
@@ -8,6 +8,8 @@
  * of this file. 
  */
 
+#include "config.h"
+
 #ifndef __config_net_h
 #define __config_net_h
 
Index: kaffe/config/config-setjmp.h
diff -u kaffe/config/config-setjmp.h:1.8 kaffe/config/config-setjmp.h:1.9
--- kaffe/config/config-setjmp.h:1.8	Wed May 21 09:09:48 2003
+++ kaffe/config/config-setjmp.h	Mon Dec 26 02:00:19 2005
@@ -8,6 +8,8 @@
  * of this file.
  */
 
+#include "config.h"
+
 #ifndef __config_setjmp_h
 #define __config_setjmp_h
 
===================================================================
Checking out kaffe/config/config-signal.h
RCS:  /home/cvs/kaffe/kaffe/config/config-signal.h,v
VERS: 1.5
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/config/config-signal.h	Mon Dec 26 02:06:47 2005
@@ -0,0 +1,51 @@
+/*
+ * config-signal.h
+ *
+ * Copyright (c) 1996, 1997
+ *	Transvirtual Technologies, Inc.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ */
+
+#include "config.h"
+
+#ifndef __config_signal_h
+#define __config_signal_h
+
+#include "config-std.h"
+#include <signal.h>
+
+/* This macro may not exist - define it if necessary */
+#if !defined(HAVE_SIGEMPTYSET)
+#define sigemptyset(s)          (*(s) = 0)
+#endif
+#if !defined(HAVE_SIGADDSET)
+#define sigaddset(s, n)         (*(s) |= (1<<((n)-1)))
+#endif
+
+/* QUICK HACK - will make more configurable in future */
+#if defined(NeXT)
+typedef int sigset_t;
+#endif
+
+#if defined(HAVE_SIGPROCMASK)
+
+/* Standard support - everything okay */
+
+#elif defined(HAVE_SIGSETMASK)
+
+/* We will clear all signals rather than just the ones we want.
+ * This is okay because of how sigprocmask is used - but it's not a
+ * general solition.
+ */
+#define	sigprocmask(op, nsig, osig)	sigsetmask(0)
+
+#else
+
+#define	sigprocmask(op, nsig, osig)
+/* Signal support (sigprocmask or sigsetmask) not available */
+
+#endif
+
+#endif
Index: kaffe/config/config.alias
diff -u kaffe/config/config.alias:1.23 kaffe/config/config.alias:1.24
--- kaffe/config/config.alias:1.23	Tue Oct 18 22:05:50 2005
+++ kaffe/config/config.alias	Mon Dec 26 02:00:19 2005
@@ -14,6 +14,7 @@
 alpha*)		Khost_cpu=alpha ;;
 sparc*)		Khost_cpu=sparc ;;
 powerpc*)	Khost_cpu=powerpc ;;
+rs6000*)	Khost_cpu=powerpc ;;
 s390*)		Khost_cpu=s390 ;;
 sh[34]*)	Khost_cpu=sh ;;
 
Index: kaffe/config/powerpc/atomic.h
diff -u kaffe/config/powerpc/atomic.h:1.3 kaffe/config/powerpc/atomic.h:1.4
--- kaffe/config/powerpc/atomic.h:1.3	Mon Aug 15 18:45:39 2005
+++ kaffe/config/powerpc/atomic.h	Mon Dec 26 02:00:19 2005
@@ -1,7 +1,9 @@
 /* Wrapper file to include the right atomic.h file for ppc depending on
    the bit size.  */
 
-#if defined(__ppc__) || defined(__powerpc__)
+/* this is imperfect possibly. On an old 64bit POWER/AIX system what happens ? */
+
+#if defined(__ppc__) || defined(__powerpc__) || defined(_POWER)
 #include "powerpc32/atomic.h"
 #elif defined(__ppc64__) || defined(__powerpc64__)
 #include "powerpc64/atomic.h"
Index: kaffe/config/powerpc/bits/atomic.h
diff -u kaffe/config/powerpc/bits/atomic.h:1.1 kaffe/config/powerpc/bits/atomic.h:1.2
--- kaffe/config/powerpc/bits/atomic.h:1.1	Mon Aug 15 18:45:40 2005
+++ kaffe/config/powerpc/bits/atomic.h	Mon Dec 26 02:00:19 2005
@@ -27,7 +27,7 @@
  * as appropriate and which in turn include this file.
  */
 
-#include <stdint.h>
+#include "config-int.h"
 
 typedef int32_t atomic32_t;
 typedef uint32_t uatomic32_t;
Index: kaffe/libraries/javalib/external/classpath/native/fdlibm/ieeefp.h
diff -u kaffe/libraries/javalib/external/classpath/native/fdlibm/ieeefp.h:1.2 kaffe/libraries/javalib/external/classpath/native/fdlibm/ieeefp.h:1.3
--- kaffe/libraries/javalib/external/classpath/native/fdlibm/ieeefp.h:1.2	Mon Dec 19 00:12:05 2005
+++ kaffe/libraries/javalib/external/classpath/native/fdlibm/ieeefp.h	Mon Dec 26 02:00:20 2005
@@ -123,7 +123,7 @@
 #define __IEEE_LITTLE_ENDIAN
 #endif
 
-#if defined (__PPC__) || defined (__ppc__) || defined (__powerpc__) || defined (__ppc64__)
+#if defined (__PPC__) || defined (__ppc__) || defined (__powerpc__) || defined (__ppc64__) || defined(_POWER)
 #if (defined(_BIG_ENDIAN) && _BIG_ENDIAN) || (defined(_AIX) && _AIX) || defined (__BIG_ENDIAN__)|| defined (__APPLE__)
 #define __IEEE_BIG_ENDIAN
 #else




More information about the kaffe mailing list