Declare ifunc resolver to return a pointer to the same type as the target

function to help GCC detect incompatibilities between the two when it's
enhanced to do so.

diff --git a/ChangeLog b/ChangeLog
index 3954f2513a74e903cbde0082ee288ce627e1c3af..573bd51ab5633d25adba6bb65b309e579119fc0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-22  Martin Sebor  <msebor@redhat.com>
+
+       * include/libc-symbols.h (__ifunc_resolver): Declare resolver
+       to return a pointer to the same type as the target function.
+
 2017-08-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #18822]

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index fe3571af52925f1c9cb8e2211d5914cf2ca08986..42fc41a1a567af7c022d74c384c479e465df434d 100644 (file)
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -803,7 +803,8 @@ for linking")
 
 /* Helper / base  macros for indirect function symbols.  */
 #define __ifunc_resolver(type_name, name, expr, arg, init, classifier) \
-  classifier inhibit_stack_protector void *name##_ifunc (arg)                                  \
+  classifier inhibit_stack_protector                                   \
+  __typeof (type_name) *name##_ifunc (arg)                             \
   {                                                                    \
     init ();                                                           \
     __typeof (type_name) *res = expr;                                  \