3 files changed, 10 insertions, 5 deletions
diff --git a/stdio-common/reg-modifier.c b/stdio-common/reg-modifier.c
index b911aea703..a52022d1ba 100644
--- a/stdio-common/reg-modifier.c
+++ b/stdio-common/reg-modifier.c
@@ -183,7 +183,8 @@ __handle_registered_modifier_wc (const unsigned int **format,
 }
 
 
-libc_freeres_fn (free_mem)
+void
+__libc_printf_freemem (void)
 {
   if (__printf_modifier_table != NULL)
     {
diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index 3ec81e6956..0d14ac6afa 100644
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -21,11 +21,11 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <libc-lock.h>
+#include <set-freeres.h>
 
 
 /* Array of functions indexed by format character.  */
-libc_freeres_ptr (printf_arginfo_size_function **__printf_arginfo_table)
-  attribute_hidden;
+printf_arginfo_size_function **__printf_arginfo_table attribute_hidden;
 printf_function **__printf_function_table attribute_hidden;
 
 __libc_lock_define_initialized (static, lock)
@@ -79,3 +79,5 @@ __register_printf_function (int spec, printf_function converter,
 				      (printf_arginfo_size_function*) arginfo);
 }
 weak_alias (__register_printf_function, register_printf_function)
+
+weak_alias (__printf_arginfo_table, __libc_reg_printf_freemem_ptr)
diff --git a/stdio-common/reg-type.c b/stdio-common/reg-type.c
index 02edac4da3..980a911ae2 100644
--- a/stdio-common/reg-type.c
+++ b/stdio-common/reg-type.c
@@ -19,11 +19,11 @@
 #include <printf.h>
 #include <stdlib.h>
 #include <libc-lock.h>
+#include <set-freeres.h>
 
 
 /* Array of functions indexed by format character.  */
-libc_freeres_ptr (printf_va_arg_function **__printf_va_arg_table)
-  attribute_hidden;
+printf_va_arg_function **__printf_va_arg_table attribute_hidden;
 
 __libc_lock_define_initialized (static, lock);
 
@@ -59,3 +59,5 @@ __register_printf_type (printf_va_arg_function fct)
   return result;
 }
 weak_alias (__register_printf_type, register_printf_type)
+
+weak_alias (__printf_va_arg_table, __libc_reg_type_freemem_ptr)