[glibc] Use correct subdir when building tst-rfc3484* for mach and arm

[glibc] Use correct subdir when building tst-rfc3484* for mach and arm

[Arjun Shankar]

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

commit 9db31d7456a68f7fc448b28dceced26db96f4d66
Author: Arjun Shankar <arjun@redhat.com>
Date:   Tue Oct 31 10:44:32 2023 +0100

    Use correct subdir when building tst-rfc3484* for mach and arm
    
    Commit 7f602256ab5b85db1dbfb5f40bd109c4b37b68c8 moved the tst-rfc3484*
    tests from posix/ to nss/, but didn't correct references to point to
    their new subdir when building for mach and arm.  This commit fixes
    that.
    
    Tested with build-many-glibcs.sh for i686-gnu.

Diff:
---
 sysdeps/mach/Makefile                | 5 ++---
 sysdeps/unix/sysv/linux/arm/Makefile | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
index a9d4aa04ce..5194e6ccea 100644
--- a/sysdeps/mach/Makefile
+++ b/sysdeps/mach/Makefile
@@ -60,12 +60,11 @@ else ifeq (nss,$(subdir))
   LDLIBS-nss_files.so += $(objdir)/mach/libmachuser.so
   LDLIBS-nss_db.so += $(objdir)/mach/libmachuser.so
   LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so
-else ifeq (hesiod,$(subdir))
-  LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so
-else ifeq (posix,$(subdir))
   LDLIBS-tst-rfc3484 += $(objdir)/mach/libmachuser.so
   LDLIBS-tst-rfc3484-2 += $(objdir)/mach/libmachuser.so
   LDLIBS-tst-rfc3484-3 += $(objdir)/mach/libmachuser.so
+else ifeq (hesiod,$(subdir))
+  LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so
 else ifeq (nscd,$(subdir))
   LDLIBS-nscd += $(objdir)/mach/libmachuser.so
 endif
diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile
index e2b5a0eab3..a73c897f43 100644
--- a/sysdeps/unix/sysv/linux/arm/Makefile
+++ b/sysdeps/unix/sysv/linux/arm/Makefile
@@ -38,9 +38,6 @@ endif
 ifeq ($(subdir),nss)
 libnss_db-sysdep_routines += libc-do-syscall
 libnss_db-shared-only-routines += libc-do-syscall
-endif
-
-ifeq ($(subdir),posix)
 LDFLAGS-tst-rfc3484 += $(common-objpfx)csu/libc-do-syscall.o
 LDFLAGS-tst-rfc3484-2 += $(common-objpfx)csu/libc-do-syscall.o
 LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o