[glibc/fw/librt] Fix librt-routines-var issues for !PTHREAD_IN_LIBC

[glibc/fw/librt] Fix librt-routines-var issues for !PTHREAD_IN_LIBC

[Florian Weimer]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ad0e4a8507f02f459d9a02c8f954b159df6702c3

commit ad0e4a8507f02f459d9a02c8f954b159df6702c3
Author: Florian Weimer <fweimer@redhat.com>
Date:   Wed Jun 2 20:21:15 2021 +0200

    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.

Diff:
---
 Makeconfig  | 2 +-
 rt/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makeconfig b/Makeconfig
index c3496452b6..6a334fa296 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1330,7 +1330,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 d19314b7dc..baec51b40a 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 \