procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

runtime: use _URC_FAILURE on ARM32

Browse source 
ARM32 EABI unwinder does not define _URC_NORMAL_STOP. Instead,
    it has _URC_FAILURE. Use _URC_FAILURE there.
    
    Should fix ARM32 build.
    
    Reviewed-on: https://go-review.googlesource.com/c/153417

From-SVN: r267033
This commit is contained in:
Ian Lance Taylor 2018-12-11 20:50:59 +00:00
parent 582d2481f7
commit be68937be2
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View file

@ -1,4 +1,4 @@
f0266d382f8965b7bcaa380aa963498c1884505e
4db15776701a7cfc1abcef08f7a98c63343d17e6
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

10
libgo/runtime/go-unwind.c
View file

@ -392,6 +392,12 @@ parse_lsda_header (struct _Unwind_Context *context, const unsigned char *p,
#define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
#endif
#ifdef __ARM_EABI_UNWINDER__
#define STOP_UNWINDING _URC_FAILURE
#else
#define STOP_UNWINDING _URC_NORMAL_STOP
#endif
#ifdef __USING_SJLJ_EXCEPTIONS__
#define PERSONALITY_FUNCTION __gccgo_personality_sj0
#define __builtin_eh_return_data_regno(x) x
@ -751,7 +757,7 @@ scanstackwithmap_callback (struct _Unwind_Context *context, void *arg)
// TODO: print gp, pc, sp
runtime_throw ("no stack map");
}
return _URC_NORMAL_STOP;
return STOP_UNWINDING;
}
case FOUND:
break;
@ -799,7 +805,7 @@ probestackmaps_callback (struct _Unwind_Context *context,
// Found a stack map. No need to keep unwinding.
runtime_usestackmaps = true;
return _URC_NORMAL_STOP;
return STOP_UNWINDING;
}
// Try to find a stack map, store the result in global variable runtime_usestackmaps.