This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] ARM EABI non-arm fix


Andrew,
I had to apply the attached patch to compile gcj for non-arm targets with the
ARM EABI patches applied.


Steve


      ___________________________________________________________ 
Want ideas for reducing your carbon footprint? Visit Yahoo! For Good  http://uk.promotions.yahoo.com/forgood/environment.html
--- libjava/exception.cc.orig	2007-08-15 14:00:42.018509532 +0100
+++ libjava/exception.cc	2007-08-15 13:56:33.040531398 +0100
@@ -213,6 +213,7 @@
 #define PERSONALITY_FUNCTION	__gcj_personality_v0
 #endif
 
+#ifdef __ARM_EABI_UNWINDER__
 #define CONTINUE_UNWINDING \
   do								\
     {								\
@@ -221,6 +222,9 @@
       return _URC_CONTINUE_UNWIND;				\
     }								\
   while (0)
+#else
+#define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND;
+#endif
 
 #ifdef __ARM_EABI_UNWINDER__
 extern "C" _Unwind_Reason_Code
@@ -290,7 +294,7 @@
   // Interface version check.
   if (version != 1)
     return _URC_FATAL_PHASE1_ERROR;
-  foreign_exception = exception_class != __gcj_exception_class)
+  foreign_exception = exception_class != __gcj_exception_class;
 #endif
 
   // Shortcut for phase 2 found handler for domestic exception.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]