[kaffe] CVS kaffe (riccardo): sparc fix: change include order and fix includes

Kaffe CVS cvs-commits at kaffe.org
Sun Dec 25 17:55:26 PST 2005


PatchSet 7054 
Date: 2005/12/26 01:49:19
Author: riccardo
Branch: HEAD
Tag: (none) 
Log:
sparc fix: change include order and fix includes

Members: 
	ChangeLog:1.4572->1.4573 
	config/sparc/atomic-sparc32v9.h:1.2->1.3 
	config/sparc/atomic-sparc64.h:1.4->1.5 
	config/sparc/common.h:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4572 kaffe/ChangeLog:1.4573
--- kaffe/ChangeLog:1.4572	Sun Dec 25 20:40:28 2005
+++ kaffe/ChangeLog	Mon Dec 26 01:49:19 2005
@@ -1,3 +1,9 @@
+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:
+	change ifdef order to get 64 bit include 64bit file
+
 2005-12-25  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/locks.c (putHeavyLock): Use atomic ops to assign hLockHolder
Index: kaffe/config/sparc/atomic-sparc32v9.h
diff -u kaffe/config/sparc/atomic-sparc32v9.h:1.2 kaffe/config/sparc/atomic-sparc32v9.h:1.3
--- kaffe/config/sparc/atomic-sparc32v9.h:1.2	Mon Jul  4 00:03:54 2005
+++ kaffe/config/sparc/atomic-sparc32v9.h	Mon Dec 26 01:49:23 2005
@@ -18,7 +18,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301 USA.  */
 
-#include <stdint.h>
+#include "config-int.h"
 
 typedef int8_t atomic8_t;
 typedef uint8_t uatomic8_t;
Index: kaffe/config/sparc/atomic-sparc64.h
diff -u kaffe/config/sparc/atomic-sparc64.h:1.4 kaffe/config/sparc/atomic-sparc64.h:1.5
--- kaffe/config/sparc/atomic-sparc64.h:1.4	Mon Jul  4 00:03:54 2005
+++ kaffe/config/sparc/atomic-sparc64.h	Mon Dec 26 01:49:23 2005
@@ -18,7 +18,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301 USA.  */
 
-#include <stdint.h>
+#include "config-int.h"
 
 typedef int8_t atomic8_t;
 typedef uint8_t uatomic8_t;
Index: kaffe/config/sparc/common.h
diff -u kaffe/config/sparc/common.h:1.13 kaffe/config/sparc/common.h:1.14
--- kaffe/config/sparc/common.h:1.13	Sun Apr 17 20:36:43 2005
+++ kaffe/config/sparc/common.h	Mon Dec 26 01:49:23 2005
@@ -19,15 +19,15 @@
 #include "gccbuiltin.h"
 
 /* Include the right compare_and_swap definition */
-#if defined(__sparcv9)
-#include "atomic-sparc32v9.h"
-#else /* !defined(__sparcv9) */
 #if defined(__arch64__)
 #include "atomic-sparc64.h"
 #else /* !defined(__arch64__) */
+#if defined(__sparcv9)
+#include "atomic-sparc32v9.h"
+#else /* !defined(__sparcv9) */
 #include "atomic-sparc32.h"
-#endif /* defined(__arch64__) */
 #endif /* defined(__sparcv9) */
+#endif /* defined(__arch64__) */
 
 #include "katomic.h"
 




More information about the kaffe mailing list