From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 8 Feb 2015 17:35:54 +0000 (+0100)
Subject: hurd: fix unwind-resume.c build
X-Git-Tag: glibc-2.22~626
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff782688919b51476a3021400e229fef075a0237;p=thirdparty%2Fglibc.git

hurd: fix unwind-resume.c build
---

diff --git a/ChangeLog b/ChangeLog
index b30e6fe887f..35d99c1fd5a 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 267949e3a3c..d446804ddf3 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;
 }