From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 21 Jun 2021 06:25:15 +0000 (+0200)
Subject: Fix librt-routines-var issues for !PTHREAD_IN_LIBC
X-Git-Tag: glibc-2.34~269
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2014d311b2b2a7d8fcf2f502493404d7ec2601c;p=thirdparty%2Fglibc.git

Fix librt-routines-var issues for !PTHREAD_IN_LIBC

The variable name was incorrect, and the existing librt-routines
variable needs to be augmented (not assigned) in rt/Makefile.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
---

diff --git a/Makeconfig b/Makeconfig
index 6482a430250..407df9e6a1c 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1344,7 +1344,7 @@ libpthread-routines-var = routines
 librt-routines-var = routines
 else
 libpthread-routines-var = libpthread-routines
-librt-routines-var = libpthread-routines
+librt-routines-var = librt-routines
 endif
 
 # A sysdeps Makeconfig fragment may set libc-reentrant to yes.
diff --git a/rt/Makefile b/rt/Makefile
index b0d887202d8..47bc594deee 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -57,7 +57,7 @@ librt-routines = \
   timer_gettime \
   timer_settime \
 
-$(librt-routines-var) = \
+$(librt-routines-var) += \
 
 tests := tst-shm tst-timer tst-timer2 \
 	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \