3 files changed, 11 insertions, 20 deletions
diff --git a/libpthread/nptl/sysdeps/arm/Makefile.arch b/libpthread/nptl/sysdeps/arm/Makefile.arch
index 71f3e401b..f1f8b2ad1 100644
--- a/libpthread/nptl/sysdeps/arm/Makefile.arch
+++ b/libpthread/nptl/sysdeps/arm/Makefile.arch
@@ -27,23 +27,17 @@ PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/arm
 PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/arm
 PTHREAD_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_SSRC))
 PTHREAD_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_CSRC))
+LIBRT_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(librt_SSRC))
+LIBRT_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(librt_CSRC))
+
 
 libpthread-a-y += $(PTHREAD_ARCH_OBJ)
 libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS)
 
-libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ)
-
-LIBC_ARCH_OBJ := $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(libc_a_CSRC))
-
-libc-a-y += $(LIBC_ARCH_OBJ)
+librt-a-y += $(LIBRT_ARCH_OBJ)
+librt-so-y += $(LIBRT_ARCH_OBJ:.o=.oS)
 
-libc-nomulti-y += $(LIBC_ARCH_OBJ)
-
-RT_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(librt_SSRC))
-RT_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(librt_CSRC))
-
-librt-a-y  += $(RT_ARCH_OBJ)
-librt-so-y += $(RT_ARCH_OBJ:.o=.oS)
+libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ)
 
 objclean-y += nptl_arch_objclean
 headers_clean-y += nptl_arch_headers_clean
@@ -54,7 +48,7 @@ headers_clean-y += nptl_arch_headers_clean
 CFLAGS-tcb-offsets.c = -S
 
 $(PTHREAD_ARCH_OUT)/tcb-offsets.c: $(PTHREAD_ARCH_DIR)/tcb-offsets.sym
-	awk -f $(top_srcdir)extra/scripts/gen-as-const.awk $< > $@
+	$(do_awk) $(top_srcdir)extra/scripts/gen-as-const.awk $< > $@
 
 $(PTHREAD_ARCH_OUT)/tcb-offsets.s: $(PTHREAD_ARCH_OUT)/tcb-offsets.c
 	$(compile.c)
@@ -69,4 +63,3 @@ nptl_arch_headers_clean:
 
 nptl_arch_objclean:
 	$(RM) $(PTHREAD_ARCH_OUT)/*.{o,os,oS}
-
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile
index 42a2b599c..43a6fad84 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile
@@ -11,4 +11,3 @@ all: objs
 include $(top_builddir)Rules.mak
 include Makefile.arch
 include $(top_srcdir)Makerules
-
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
index f5970838f..7dfaacc9d 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
@@ -34,11 +34,11 @@ libpthread-so-y += $(LINUX_ARCH_OBJ:.o=.oS)
 
 libpthread-nomulti-y+=$(LINUX_ARCH_OBJ)
 
-LIBC_LINUX_ARCH_OBJ:=$(patsubst %.S,$(LINUX_ARCH_OUT)/%.o,$(libc_a_SSRC))
-LIBC_LINUX_ARCH_OBJ+=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libc_a_CSRC))
+LIBC_LINUX_ARCH_OBJ:=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libc_a_CSRC))
+LIBC_LINUX_ARCH_OBJ+=$(patsubst %.S,$(LINUX_ARCH_OUT)/%.o,$(libc_a_SSRC))
 
-libc-a-y+=$(LIBC_LINUX_ARCH_OBJ)
-libc-so-y+=$(LIBC_LINUX_ARCH_OBJ:.o=.oS)
+libc-static-y+=$(LIBC_LINUX_ARCH_OBJ)
+libc-shared-y+=$(LIBC_LINUX_ARCH_OBJ:.o=.oS)
 
 libc-nomulti-y+=$(LIBC_LINUX_ARCH_OBJ)
 
@@ -46,4 +46,3 @@ objclean-y+=pthread_linux_arch_objclean
 
 pthread_linux_arch_objclean:
 	$(RM) $(LINUX_ARCH_OUT)/*.{o,os,oS}
-