about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-08 18:35:54 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-08 18:35:54 +0100
commitff782688919b51476a3021400e229fef075a0237 (patch)
tree4748f2d056464877f61d2e66a6343aa550ebe96b
parent335190fb39a251348a406e58f8686f5921b5ffc8 (diff)
downloadglibc-ff782688919b51476a3021400e229fef075a0237.tar.gz
glibc-ff782688919b51476a3021400e229fef075a0237.tar.xz
glibc-ff782688919b51476a3021400e229fef075a0237.zip
hurd: fix unwind-resume.c build
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/gnu/unwind-resume.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b30e6fe887..35d99c1fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 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.
 
 2015-02-07  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c
index 267949e3a3..d446804ddf 100644
--- a/sysdeps/gnu/unwind-resume.c
+++ b/sysdeps/gnu/unwind-resume.c
@@ -57,7 +57,9 @@ _Unwind_Resume (struct _Unwind_Exception *exc)
     __libgcc_s_init ();
 
   __typeof (__libgcc_s_resume) resume = __libgcc_s_resume;
+#ifdef PTR_DEMANGLE
   PTR_DEMANGLE (resume);
+#endif
   (*resume) (exc);
 }
 #endif
@@ -69,6 +71,8 @@ __gcc_personality_v0 PERSONALITY_PROTO
     __libgcc_s_init ();
 
   __typeof (libgcc_s_personality) personality = libgcc_s_personality;
+#ifdef PTR_DEMANGLE
   PTR_DEMANGLE (personality);
+#endif
   return (*personality) PERSONALITY_ARGS;
 }