diff options
| author | Rich Felker <dalias@aerifal.cx> | 2016-01-20 02:31:06 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-01-20 02:31:06 +0000 |
| commit | b6363bb70aad402be7c548a7ec053b124db076d9 (patch) | |
| tree | 24f84b86d5c430430edad5557e7699b496411151 | |
| parent | af21a82ccc8687aa16e85def7db95efeae4cf72e (diff) | |
| download | musl-b6363bb70aad402be7c548a7ec053b124db076d9.tar.gz musl-b6363bb70aad402be7c548a7ec053b124db076d9.tar.xz musl-b6363bb70aad402be7c548a7ec053b124db076d9.zip | |
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.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/src/atomics.c | 0 | ||||
| -rw-r--r-- | arch/arm/src/atomics.s (renamed from arch/arm/src/arm/atomics.s) | 0 |
3 files changed, 1 insertions, 1 deletions
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 --- a/arch/arm/src/atomics.c +++ /dev/null diff --git a/arch/arm/src/arm/atomics.s b/arch/arm/src/atomics.s index 5c5b0e3e..5c5b0e3e 100644 --- a/arch/arm/src/arm/atomics.s +++ b/arch/arm/src/atomics.s |