From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu, 21 Oct 2021 20:26:32 +0000 (-0300)
Subject: elf: Fix e6fd79f379 build with --enable-tunables=no
X-Git-Tag: glibc-2.35~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=927246e1882e4aa0ac3abac1fc795be494c38141;p=thirdparty%2Fglibc.git

elf: Fix e6fd79f379 build with --enable-tunables=no

The _dl_sort_maps_init() is not defined when tunables is not enabled.

Checked on x86_64-linux-gnu.
---

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 65a6a516330..1318c36dcef 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1245,7 +1245,16 @@ extern struct link_map * _dl_get_dl_main_map (void)
 #endif
 
 /* Initialize the DSO sort algorithm to use.  */
+#if !HAVE_TUNABLES
+static inline void
+__always_inline
+_dl_sort_maps_init (void)
+{
+  /* This is optimized out if tunables are not enabled.  */
+}
+#else
 extern void _dl_sort_maps_init (void) attribute_hidden;
+#endif
 
 /* Initialization of libpthread for statically linked applications.
    If libpthread is not linked in, this is an empty function.  */