From: Igor Tsimbalist <igor.v.tsimbalist@intel.com>
Date: Mon, 20 Nov 2017 12:30:25 +0000 (+0100)
Subject: re PR bootstrap/83015 (bootstrap comparison failure on ia64)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ebafce0bc9072f9aabd0692bbb1aeda672f6b60;p=gcc.git

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
---

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 234f0b274f6..4d3539ed0d1 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -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
diff --git a/libgcc/config/cr16/unwind-cr16.c b/libgcc/config/cr16/unwind-cr16.c
index 1a5ca7903f5..f8582012be0 100644
--- a/libgcc/config/cr16/unwind-cr16.c
+++ b/libgcc/config/cr16/unwind-cr16.c
@@ -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));         \
diff --git a/libgcc/config/ia64/unwind-ia64.c b/libgcc/config/ia64/unwind-ia64.c
index dabe4e647a0..979c1738320 100644
--- a/libgcc/config/ia64/unwind-ia64.c
+++ b/libgcc/config/ia64/unwind-ia64.c
@@ -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;
diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
index 60b80bd0f72..563c3e986a7 100644
--- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
@@ -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));		 \
diff --git a/libgcc/unwind-sjlj.c b/libgcc/unwind-sjlj.c
index e484bee5368..b719d14c2c8 100644
--- a/libgcc/unwind-sjlj.c
+++ b/libgcc/unwind-sjlj.c
@@ -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);