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 234f0b274f6f6c23616d545c17a364dc41ff2930..4d3539ed0d1c491971ec12e8efa9e82b06ff9f14 100644 (file)
--- 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 1a5ca7903f53fab3a147e50674a92caa76472011..f8582012be0342afc11ab6743e5a7710c70a0838 100644 (file)
--- 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 dabe4e647a0ac22168b74126f49b9af282b28a91..979c17383209ee21d872f2456dcea4142ad3cb77 100644 (file)
--- 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 60b80bd0f728a413cdba1499d428d0fa6f7fa3c9..563c3e986a73ae95cc2c61daf799c72f4bf0aee7 100644 (file)
--- 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 e484bee5368138b0780c7147ffd74f892fcb2bb9..b719d14c2c8b4f9a75affafff77cc9d5dfb66250 100644 (file)
--- 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);