re PR bootstrap/83015 (bootstrap comparison failure on ia64)

PR bootstrap/83015
	* config/cr16/unwind-cr16.c (uw_install_context): Add FRAMES
	parameter.
	* config/xtensa/unwind-dw2-xtensa.c: Likewise
	* config/ia64/unwind-ia64.c: Add frames parameter.
	* unwind-sjlj.c: Likewise.

From-SVN: r254951
This commit is contained in:
Igor Tsimbalist 2017-11-20 13:30:25 +01:00 committed by Igor Tsimbalist
parent 0a413fbc6c
commit 1ebafce0bc
5 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,12 @@
2017-11-20 Igor Tsimbalist <igor.v.tsimbalist@intel.com>
PR bootstrap/83015
* config/cr16/unwind-cr16.c (uw_install_context): Add FRAMES
parameter.
* config/xtensa/unwind-dw2-xtensa.c: Likewise
* config/ia64/unwind-ia64.c: Add frames parameter.
* unwind-sjlj.c: Likewise.
2017-11-17 Igor Tsimbalist <igor.v.tsimbalist@intel.com>
* config/i386/linux-unwind.h: Include

View File

@ -1567,7 +1567,7 @@ _Unwind_DebugHook (void *cfa __attribute__ ((__unused__)),
our caller. */
#if defined( __CR16C__ )
#define uw_install_context(CURRENT, TARGET) \
#define uw_install_context(CURRENT, TARGET, FRAMES) \
do \
{ \
long offset = uw_install_context_1 ((CURRENT), (TARGET)); \
@ -1578,7 +1578,7 @@ _Unwind_DebugHook (void *cfa __attribute__ ((__unused__)),
} \
while (0)
#else
#define uw_install_context(CURRENT, TARGET) \
#define uw_install_context(CURRENT, TARGET, FRAMES) \
do \
{ \
long offset = uw_install_context_1 ((CURRENT), (TARGET)); \

View File

@ -2165,7 +2165,8 @@ uw_init_context_1 (struct _Unwind_Context *context, void *bsp)
static void __attribute__((noreturn))
uw_install_context (struct _Unwind_Context *current __attribute__((unused)),
struct _Unwind_Context *target)
struct _Unwind_Context *target,
unsigned long frames __attribute__((unused)))
{
unw_word ireg_buf[4], ireg_nat = 0, ireg_pr = 0;
unw_word saved_lc;

View File

@ -483,7 +483,7 @@ uw_init_context_1 (struct _Unwind_Context *context, void *outer_cfa,
macro because __builtin_eh_return must be invoked in the context of
our caller. */
#define uw_install_context(CURRENT, TARGET) \
#define uw_install_context(CURRENT, TARGET, FRAMES) \
do \
{ \
long offset = uw_install_context_1 ((CURRENT), (TARGET)); \

View File

@ -300,7 +300,8 @@ uw_init_context (struct _Unwind_Context *context)
static void __attribute__((noreturn))
uw_install_context (struct _Unwind_Context *current __attribute__((unused)),
struct _Unwind_Context *target)
struct _Unwind_Context *target,
unsigned long frames __attribute__((unused)))
{
_Unwind_SjLj_SetContext (target->fc);
longjmp (target->fc->jbuf, 1);