PatchSet 6656
Date: 2005/06/21 16:41:31
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fix for the fix of __builtin_trap.
Members:
ChangeLog:1.4182->1.4183
config/config-hacks.h:1.17->1.18
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4182 kaffe/ChangeLog:1.4183
--- kaffe/ChangeLog:1.4182 Tue Jun 21 16:29:30 2005
+++ kaffe/ChangeLog Tue Jun 21 16:41:31 2005
@@ -1,5 +1,12 @@
2005-06-21 Guilhem Lavaux <[EMAIL PROTECTED]>
+ * config/config-hacks.c: We must redefine __builtin_trap until gcc
+ 3.1.
+
+ Reported by Andrew Pinsky <[EMAIL PROTECTED]>
+
+2005-06-21 Guilhem Lavaux <[EMAIL PROTECTED]>
+
* config/katomic.h: Include config-hacks.h to be sure the hacks are
taken into account.
Index: kaffe/config/config-hacks.h
diff -u kaffe/config/config-hacks.h:1.17 kaffe/config/config-hacks.h:1.18
--- kaffe/config/config-hacks.h:1.17 Tue Jun 21 16:29:38 2005
+++ kaffe/config/config-hacks.h Tue Jun 21 16:41:36 2005
@@ -80,7 +80,7 @@
/*
* GCC before 3.0 does not support explicit branch optimization.
*/
-#if !defined(__GNUC__) || (__GNUC__ < 3)
+#if !defined(__GNUC__) || (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__
== 0)
#define __builtin_expect(a,b) (a)
#include <stdlib.h>
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
