[kaffe] CVS kaffe (robilad): Added workaround for missing __builtin_expect from gcc

[Kaffe CVS]

PatchSet 5633 
Date: 2005/04/01 05:12:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Added workaround for missing __builtin_expect from gcc

2005-04-01  Dalibor Topic  <topic at localhost.localdomain>

        Define __builtin_expected away on gcc < 3.0

        * include/Makefile.am (noinst_HEADERS): Added gccbuiltin.h.

        * include/defs.h: Include gccbuiltin.h.

        * include/gccbuiltin.h: New file. Taken from gcc CVS
        file gcc/gcc/system.h.

        Reported by:  Riccardo Mottola <zuse at libero.it>

Members: 
	ChangeLog:1.3804->1.3805 
	include/Makefile.am:1.92->1.93 
	include/Makefile.in:1.220->1.221 
	include/defs.h:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3804 kaffe/ChangeLog:1.3805
--- kaffe/ChangeLog:1.3804	Fri Apr  1 01:02:55 2005
+++ kaffe/ChangeLog	Fri Apr  1 05:12:40 2005
@@ -1,3 +1,16 @@
+2005-04-01  Dalibor Topic  <topic at localhost.localdomain>
+
+	Define __builtin_expected away on gcc < 3.0
+
+	* include/Makefile.am (noinst_HEADERS): Added gccbuiltin.h.
+
+	* include/defs.h: Include gccbuiltin.h.
+
+	* include/gccbuiltin.h: New file. Taken from gcc CVS
+	file gcc/gcc/system.h.
+
+	Reported by:  Riccardo Mottola <zuse at libero.it>
+	
 2005-04-01  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/clib/nio/gnu_java_nio_VMSelector.c (Java_gnu_java_nio_VMSelector_select): 
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.92 kaffe/include/Makefile.am:1.93
--- kaffe/include/Makefile.am:1.92	Tue Feb 15 09:34:23 2005
+++ kaffe/include/Makefile.am	Fri Apr  1 05:12:44 2005
@@ -209,8 +209,8 @@
 endif
 
 if COND_CLASSPATH_GTK_AWT
-  JAWT_HDRS = \
-  	jawt.h \
+JAWT_HDRS = \
+	jawt.h \
 	jawt_md.h
 endif
 
@@ -266,6 +266,7 @@
 	defs.h \
 	dummyin6.h \
 	files.h \
+	gccbuiltin.h \
 	getaddrinfo.h \
 	gettext.h \
 	nets.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.220 kaffe/include/Makefile.in:1.221
--- kaffe/include/Makefile.in:1.220	Thu Mar 31 11:55:17 2005
+++ kaffe/include/Makefile.in	Fri Apr  1 05:12:44 2005
@@ -553,7 +553,7 @@
 @COND_NATIVE_SOUND_TRUE@@COND_SOUND_ESD_TRUE at MAYBE_LIBTRITONUSESD_JNI_HDRS = $(LIBTRITONUSESD_JNI_HDRS)
 @COND_CLASSPATH_GTK_AWT_TRUE@@COND_NATIVE_AWT_TRUE at MAYBE_LIBGTKPEER_JNI_HDRS = $(LIBGTKPEER_JNI_HDRS)
 @COND_CLASSPATH_GTK_AWT_TRUE at JAWT_HDRS = \
- at COND_CLASSPATH_GTK_AWT_TRUE@  	jawt.h \
+ at COND_CLASSPATH_GTK_AWT_TRUE@	jawt.h \
 @COND_CLASSPATH_GTK_AWT_TRUE@	jawt_md.h
 
 NOINSTALL_JNI_DERIVED_HDRS = \
@@ -600,6 +600,7 @@
 	defs.h \
 	dummyin6.h \
 	files.h \
+	gccbuiltin.h \
 	getaddrinfo.h \
 	gettext.h \
 	nets.h \
Index: kaffe/include/defs.h
diff -u kaffe/include/defs.h:1.7 kaffe/include/defs.h:1.8
--- kaffe/include/defs.h:1.7	Sun Mar 13 11:31:48 2005
+++ kaffe/include/defs.h	Fri Apr  1 05:12:45 2005
@@ -14,6 +14,8 @@
 #ifndef __defs_h
 #define __defs_h
 
+#include "gccbuiltin.h"
+
 #define	MAXNUMLEN	64
 #define	MAXLIBPATH	1024