2 files changed, 0 insertions, 16 deletions
diff --git a/libpthread/nptl/sysdeps/pthread/pthread-functions.h b/libpthread/nptl/sysdeps/pthread/pthread-functions.h
index 119fe6b71..9c78180c5 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread-functions.h
+++ b/libpthread/nptl/sysdeps/pthread/pthread-functions.h
@@ -102,15 +102,7 @@ struct pthread_functions
 extern struct pthread_functions __libc_pthread_functions attribute_hidden;
 extern int __libc_pthread_functions_init attribute_hidden;
 
-#if 0 /* def PTR_DEMANGLE */ /* we did not mangle, so do not demangle */
-# define PTHFCT_CALL(fct, params) \
-  ({ __typeof (__libc_pthread_functions.fct) __p;			      \
-     __p = __libc_pthread_functions.fct;				      \
-     PTR_DEMANGLE (__p);						      \
-     __p params; })
-#else
 # define PTHFCT_CALL(fct, params) \
   __libc_pthread_functions.fct params
-#endif
 
 #endif	/* pthread-functions.h */
diff --git a/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c b/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c
index 6936a896e..6b6ad6f4f 100644
--- a/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c
+++ b/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c
@@ -70,13 +70,9 @@ pthread_cancel_init (void)
     abort();
   }
 
-  PTR_MANGLE (resume);
   libgcc_s_resume = resume;
-  PTR_MANGLE (personality);
   libgcc_s_personality = personality;
-  PTR_MANGLE (forcedunwind);
   libgcc_s_forcedunwind = forcedunwind;
-  PTR_MANGLE (getcfa);
   libgcc_s_getcfa = getcfa;
   /* Make sure libgcc_s_handle is written last.  Otherwise,
      pthread_cancel_init might return early even when the pointer the
@@ -104,7 +100,6 @@ _Unwind_Resume (struct _Unwind_Exception *exc)
     pthread_cancel_init ();
 
   void (*resume) (struct _Unwind_Exception *exc) = libgcc_s_resume;
-  PTR_DEMANGLE (resume);
   resume (exc);
 }
 
@@ -125,7 +120,6 @@ __gcc_personality_v0 (int version, _Unwind_Action actions,
   _Unwind_Reason_Code (*personality)
     (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
      struct _Unwind_Context *) = libgcc_s_personality;
-  PTR_DEMANGLE (personality);
   return personality (version, actions, exception_class, ue_header, context);
 }
 
@@ -139,7 +133,6 @@ _Unwind_ForcedUnwind (struct _Unwind_Exception *exc, _Unwind_Stop_Fn stop,
   _Unwind_Reason_Code (*forcedunwind)
     (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *)
     = libgcc_s_forcedunwind;
-  PTR_DEMANGLE (forcedunwind);
   return forcedunwind (exc, stop, stop_argument);
 }
 
@@ -150,6 +143,5 @@ _Unwind_GetCFA (struct _Unwind_Context *context)
     pthread_cancel_init ();
 
   _Unwind_Word (*getcfa) (struct _Unwind_Context *) = libgcc_s_getcfa;
-  PTR_DEMANGLE (getcfa);
   return getcfa (context);
 }