Allow building with --disable-nscd again.
Checks
Commit Message
The change 88677348b4de breaks the build with undefiend references to
the NSCD functions.
---
malloc/set-freeres.c | 6 ++++++
1 file changed, 6 insertions(+)
Comments
On 27/03/23 18:04, Flavio Cruz via Libc-alpha wrote:
> The change 88677348b4de breaks the build with undefiend references to
> the NSCD functions.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> malloc/set-freeres.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c
> index f452ff838b..42d70d3971 100644
> --- a/malloc/set-freeres.c
> +++ b/malloc/set-freeres.c
> @@ -37,11 +37,13 @@
> # pragma weak __intl_freemem
> # pragma weak __libio_freemem
> # pragma weak __libc_fstab_freemem
> +#ifdef USE_NSCD
> # pragma weak __nscd_gr_map_freemem
> # pragma weak __nscd_hst_map_freemem
> # pragma weak __nscd_pw_map_freemem
> # pragma weak __nscd_serv_map_freemem
> # pragma weak __nscd_group_map_freemem
> +#endif
> # pragma weak __libc_regcomp_freemem
> # pragma weak __libc_atfork_freemem
> # pragma weak __res_thread_freeres
> @@ -95,11 +97,15 @@ __libc_freeres (void)
> call_function_static_weak (__intl_freemem);
> call_function_static_weak (__libio_freemem);
> call_function_static_weak (__libc_fstab_freemem);
> +
> +#ifdef USE_NSCD
> call_function_static_weak (__nscd_gr_map_freemem);
> call_function_static_weak (__nscd_hst_map_freemem);
> call_function_static_weak (__nscd_pw_map_freemem);
> call_function_static_weak (__nscd_serv_map_freemem);
> call_function_static_weak (__nscd_group_map_freemem);
> +#endif
> +
> call_function_static_weak (__libc_regcomp_freemem);
> call_function_static_weak (__libc_atfork_freemem);
> /* __res_thread_freeres deallocates the per-thread resolv_context);
@@ -37,11 +37,13 @@
# pragma weak __intl_freemem
# pragma weak __libio_freemem
# pragma weak __libc_fstab_freemem
+#ifdef USE_NSCD
# pragma weak __nscd_gr_map_freemem
# pragma weak __nscd_hst_map_freemem
# pragma weak __nscd_pw_map_freemem
# pragma weak __nscd_serv_map_freemem
# pragma weak __nscd_group_map_freemem
+#endif
# pragma weak __libc_regcomp_freemem
# pragma weak __libc_atfork_freemem
# pragma weak __res_thread_freeres
@@ -95,11 +97,15 @@ __libc_freeres (void)
call_function_static_weak (__intl_freemem);
call_function_static_weak (__libio_freemem);
call_function_static_weak (__libc_fstab_freemem);
+
+#ifdef USE_NSCD
call_function_static_weak (__nscd_gr_map_freemem);
call_function_static_weak (__nscd_hst_map_freemem);
call_function_static_weak (__nscd_pw_map_freemem);
call_function_static_weak (__nscd_serv_map_freemem);
call_function_static_weak (__nscd_group_map_freemem);
+#endif
+
call_function_static_weak (__libc_regcomp_freemem);
call_function_static_weak (__libc_atfork_freemem);
/* __res_thread_freeres deallocates the per-thread resolv_context);