From b6363bb70aad402be7c548a7ec053b124db076d9 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 20 Jan 2016 02:31:06 +0000
Subject: [PATCH] fix build regression for arm pre-v7 from out-of-tree build
 patch

commit 2f853dd6b9a95d5b13ee8f9df762125e0588df5d failed to replicate
the old makefile logic that caused arch/arm/src/arm/atomics.s to be
built. since this was the only .s file under arch/*/src, rather than
trying to reproduce the old logic, I'm just moving it up a level and
adjusting the glob pattern in the makefile to catch it. eventually
arch/*/src will probably be removed in favor of moving all these files
to appropriate src/*/$(ARCH) locations.
---
 Makefile                         | 2 +-
 arch/arm/src/atomics.c           | 0
 arch/arm/src/{arm => }/atomics.s | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 arch/arm/src/atomics.c
 rename arch/arm/src/{arm => }/atomics.s (100%)

diff --git a/Makefile b/Makefile
index ff744457..7f11d637 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ includedir = $(prefix)/include
 libdir = $(prefix)/lib
 syslibdir = /lib
 
-BASE_SRCS = $(sort $(wildcard $(srcdir)/src/*/*.c $(srcdir)/arch/$(ARCH)/src/*.c))
+BASE_SRCS = $(sort $(wildcard $(srcdir)/src/*/*.c $(srcdir)/arch/$(ARCH)/src/*.[csS]))
 BASE_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(BASE_SRCS)))
 ARCH_SRCS = $(wildcard $(srcdir)/src/*/$(ARCH)/*.[csS] $(srcdir)/src/*/$(ARCH)$(ASMSUBARCH)/*.sub)
 ARCH_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(ARCH_SRCS)))
diff --git a/arch/arm/src/atomics.c b/arch/arm/src/atomics.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/arch/arm/src/arm/atomics.s b/arch/arm/src/atomics.s
similarity index 100%
rename from arch/arm/src/arm/atomics.s
rename to arch/arm/src/atomics.s