hurd: fix unwind-resume.c build

diff --git a/ChangeLog b/ChangeLog
index 35d99c1fd5ab8b8cc305ce52ffbaa1b3f6787355..a1cffb57ba8d6c6684222be2b29f40de194afce5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
 2015-02-08  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * time/getdate.c: Include <stdbool.h>.
-       * sysdeps/gnu/unwind-resume.c [!PTR_DEMANGLE] (_Unwind_Resume,
-       __gcc_personality_v0): Do not call PTR_DEMANGLE.
+       * sysdeps/gnu/unwind-resume.c [!PTR_MANGLE] (__libgcc_s_init): Do not
+       call PTR_MANGLE.
+       [!PTR_DEMANGLE] (_Unwind_Resume, __gcc_personality_v0): Do not call
+       PTR_DEMANGLE.
 
 2015-02-07  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c
index d446804ddf3232397db5ab694649f9dc7649c7d4..534f8a9c921e36b5bdf8ef08bfeb2756f8cc4ab7 100644 (file)
--- a/sysdeps/gnu/unwind-resume.c
+++ b/sysdeps/gnu/unwind-resume.c
@@ -43,9 +43,13 @@ __libgcc_s_init (void)
     __libc_fatal (LIBGCC_S_SO
                   " must be installed for pthread_cancel to work\n");
 
+#ifdef PTR_MANGLE
   PTR_MANGLE (resume);
+#endif
   __libgcc_s_resume = resume;
+#ifdef PTR_MANGLE
   PTR_MANGLE (personality);
+#endif
   libgcc_s_personality = personality;
 }