about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicholas Wilson <nicholas.wilson@realvnc.com>2017-12-07 15:55:52 +0000
committerRich Felker <dalias@aerifal.cx>2017-12-14 23:19:34 -0500
commit2a831786f0be3f54c5a7693eb3ae8fdc4c4ecb85 (patch)
tree07bc7f453680bb3f6af58fb083023ea27169afdb
parenteb7f93c4f6fd0b637a9f8d6e112131b88ad2b00f (diff)
downloadmusl-2a831786f0be3f54c5a7693eb3ae8fdc4c4ecb85.tar.gz
musl-2a831786f0be3f54c5a7693eb3ae8fdc4c4ecb85.tar.xz
musl-2a831786f0be3f54c5a7693eb3ae8fdc4c4ecb85.zip
remove unused explicit dependency rules for crti/crtn
notes by maintainer:

commit 2f853dd6b9a95d5b13ee8f9df762125e0588df5d added these rules
because the new system for handling arch-provided replacement files
introduced for out-of-tree builds did not apply to the crt tree.

commit 63bcda4d8f4074e9d92ae156afd0dced6e64eb65 later adapted the
makefile logic so that the crt and ldso trees go through the same
replacement logic as everything else, but failed to remove the
explicit rules that assumed the arch would always provide asm
replacements.

in addition to cleaning things up, removing these spurious rules
allows crti/crtn asm to be omitted by an arch (thereby using the empty
C files instead) if they are not needed.
-rw-r--r--Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d2e89979..308ddaae 100644
--- a/Makefile
+++ b/Makefile
@@ -113,10 +113,6 @@ obj/crt/rcrt1.o: $(srcdir)/ldso/dlstart.c
 
 obj/crt/Scrt1.o obj/crt/rcrt1.o: CFLAGS_ALL += -fPIC
 
-obj/crt/$(ARCH)/crti.o: $(srcdir)/crt/$(ARCH)/crti.s
-
-obj/crt/$(ARCH)/crtn.o: $(srcdir)/crt/$(ARCH)/crtn.s
-
 OPTIMIZE_SRCS = $(wildcard $(OPTIMIZE_GLOBS:%=$(srcdir)/src/%))
 $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.o) $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.lo): CFLAGS += -O3