Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 1 insertions, 3 deletions

diff --git a/src/alloc.c b/src/alloc.c
index f2b80fac882..d6ba4d97905 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4952,12 +4952,10 @@ typedef union
 #ifdef HAVE___BUILTIN_UNWIND_INIT
 # define SET_STACK_TOP_ADDRESS(p)       \
    stacktop_sentry sentry;              \
-   __builtin_unwind_init ();            \
    *(p) = NEAR_STACK_TOP (&sentry)
 #else
 # define SET_STACK_TOP_ADDRESS(p)               \
    stacktop_sentry sentry;                      \
-   __builtin_unwind_init ();                    \
    test_setjmp ();                              \
    sys_setjmp (sentry.j);                       \
    *(p) = NEAR_STACK_TOP (&sentry + (stack_bottom < &sentry.c))
@@ -5033,7 +5031,7 @@ mark_stack (char const *bottom, char const *end)
    from FUNC.  */
 
 NO_INLINE void
-flush_stack_call_func (void (*func) (void *arg), void *arg)
+flush_stack_call_func1 (void (*func) (void *arg), void *arg)
 {
   void *end;
   struct thread_state *self = current_thread;