X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fstacktrace.cc;h=d8d1f38ae6c8b2be22a2258727f51dfb202881a4;hb=cfc43899da16d29b6e83239e4a92befac428d31a;hp=c3fbdf4e6a43ae6b8095fa30bfd45ae0a163ac52;hpb=6f1e93c7f179d40a03ce718a09331d584ff6a021;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc
index c3fbdf4e6a4..d8d1f38ae6c 100644
--- a/libjava/stacktrace.cc
+++ b/libjava/stacktrace.cc
@@ -39,6 +39,10 @@ using namespace java::lang::reflect;
 using namespace java::util;
 using namespace gnu::gcj::runtime;
 
+#ifdef __ARM_EABI_UNWINDER__
+#define _URC_NORMAL_STOP _URC_FAILURE
+#endif
+
 // Maps ncode values to their containing native class.
 // NOTE: Currently this Map contradicts class GC for native classes. This map
 // (and the "new class stack") will need to use WeakReferences in order to 
@@ -138,7 +142,6 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
       state->interp_frame = state->interp_frame->next_interp;
     }
   else 
-#endif
   // We handle proxies in the same way as interpreted classes
   if (_Jv_is_proxy (func_addr))
     {
@@ -148,6 +151,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
       state->interp_frame = state->interp_frame->next_interp;
     }
   else 
+#endif
     {
 #ifdef HAVE_GETIPINFO
       _Unwind_Ptr ip;