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 --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
index a9d4aa04ceab42eed2bbaec5575ff864aa397bf4..5194e6ccea9cb3900671d74efc4f5cc3ab1d1e0d 100644 (file)
--- 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 e2b5a0eab3ae99e4020a79e10a77fadd21e2b185..a73c897f43c9a206f02eb0c6a8b56b3437fc6438 100644 (file)
--- 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