← Back to branch summary

~angelsl/ubuntu/wily/gcc-5/mips-cross

« back to all changes in this revision

Viewing changes to debian/patches/libjava-armel-unwind.diff

  • Committer: angelsl
  • Date: 2015-10-30 03:30:35 UTC
  • Revision ID: angelsl-20151030033035-rmug41zm8hyjgisg
Original import

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/libjava-armel-unwind.diff
 
1
# DP: On armel, apply kludge to fix unwinder infinitely looping 'til it runs out
 
2
# DP: of memory (http://gcc.gnu.org/ml/java/2008-06/msg00010.html).
 
3
 
 
4
---
 
5
 libjava/stacktrace.cc |    3 +++
 
6
 1 files changed, 3 insertions(+), 0 deletions(-)
 
7
 
 
8
--- a/src/libjava/stacktrace.cc
 
9
+++ b/src/libjava/stacktrace.cc
 
10
@@ -115,6 +115,9 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
 
11
   // Check if the trace buffer needs to be extended.
 
12
   if (pos == state->length)
 
13
     {
 
14
+      // http://gcc.gnu.org/ml/java/2008-06/msg00010.html
 
15
+      return _URC_END_OF_STACK;
 
16
+
 
17
       int newLength = state->length * 2;
 
18
       void *newFrames = _Jv_AllocBytes (newLength * sizeof(_Jv_StackFrame));
 
19
       memcpy (newFrames, state->frames, state->length * sizeof(_Jv_StackFrame));