X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=7ac58d486c3ca803f07223c50c68dd0a218d17ba;hb=e5937885de3c8d493a9d2978aa46a771740c7458;hp=997c5bbc9cea9896dbfb72c3e91febfa80a3c16a;hpb=dfdc337b3b276e6ea0e4786ede699f4d0d93dc40;p=musl diff --git a/Makefile b/Makefile index 997c5bbc..7ac58d48 100644 --- a/Makefile +++ b/Makefile @@ -36,8 +36,10 @@ CFLAGS_ALL_SHARED = $(CFLAGS_ALL) -fPIC -DSHARED AR = $(CROSS_COMPILE)ar RANLIB = $(CROSS_COMPILE)ranlib +INSTALL = ./tools/install.sh -ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH)) +ARCH_INCLUDES = $(wildcard arch/$(ARCH)/bits/*.h) +ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH) $(ARCH_INCLUDES:arch/$(ARCH)/%=include/%)) EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a) @@ -48,7 +50,7 @@ TOOL_LIBS = lib/musl-gcc.specs ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) ALL_TOOLS = tools/musl-gcc -LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH).so.1 +LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1 -include config.mak @@ -72,19 +74,43 @@ include/bits: @test "$(ARCH)" || { echo "Please set ARCH in config.mak before running make." ; exit 1 ; } ln -sf ../arch/$(ARCH)/bits $@ -include/bits/alltypes.h.sh: include/bits +include/bits/alltypes.h.in: include/bits -include/bits/alltypes.h: include/bits/alltypes.h.sh - sh $< > $@ +include/bits/alltypes.h: include/bits/alltypes.h.in include/alltypes.h.in tools/mkalltypes.sed + sed -f tools/mkalltypes.sed include/bits/alltypes.h.in include/alltypes.h.in > $@ src/ldso/dynlink.lo: arch/$(ARCH)/reloc.h +crt/crt1.o crt/Scrt1.o: $(wildcard arch/$(ARCH)/crt_arch.h) + +crt/Scrt1.o: CFLAGS += -fPIC + +OPTIMIZE_SRCS = $(wildcard $(OPTIMIZE_GLOBS:%=src/%)) +$(OPTIMIZE_SRCS:%.c=%.o) $(OPTIMIZE_SRCS:%.c=%.lo): CFLAGS += -O3 + +MEMOPS_SRCS = src/string/memcpy.c src/string/memmove.c src/string/memcmp.c src/string/memset.c +$(MEMOPS_SRCS:%.c=%.o) $(MEMOPS_SRCS:%.c=%.lo): CFLAGS += $(CFLAGS_MEMOPS) + +# This incantation ensures that changes to any subarch asm files will +# force the corresponding object file to be rebuilt, even if the implicit +# rule below goes indirectly through a .sub file. +define mkasmdep +$(dir $(patsubst %/,%,$(dir $(1))))$(notdir $(1:.s=.o)): $(1) +endef +$(foreach s,$(wildcard src/*/$(ARCH)*/*.s),$(eval $(call mkasmdep,$(s)))) + +%.o: $(ARCH)$(ASMSUBARCH)/%.sub + $(CC) $(CFLAGS_ALL_STATIC) -c -o $@ $(dir $<)$(shell cat $<) + %.o: $(ARCH)/%.s $(CC) $(CFLAGS_ALL_STATIC) -c -o $@ $< %.o: %.c $(GENH) $(IMPH) $(CC) $(CFLAGS_ALL_STATIC) -c -o $@ $< +%.lo: $(ARCH)$(ASMSUBARCH)/%.sub + $(CC) $(CFLAGS_ALL_SHARED) -c -o $@ $(dir $<)$(shell cat $<) + %.lo: $(ARCH)/%.s $(CC) $(CFLAGS_ALL_SHARED) -c -o $@ $< @@ -116,22 +142,22 @@ tools/musl-gcc: config.mak chmod +x $@ $(DESTDIR)$(bindir)/%: tools/% - install -D $< $@ + $(INSTALL) -D $< $@ $(DESTDIR)$(libdir)/%.so: lib/%.so - install -D -m 755 $< $@ + $(INSTALL) -D -m 755 $< $@ $(DESTDIR)$(libdir)/%: lib/% - install -D -m 644 $< $@ + $(INSTALL) -D -m 644 $< $@ -$(DESTDIR)$(includedir)/%: include/% - install -D -m 644 $< $@ +$(DESTDIR)$(includedir)/bits/%: arch/$(ARCH)/bits/% + $(INSTALL) -D -m 644 $< $@ -$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(syslibdir) - ln -sf $(libdir)/libc.so $@ || true +$(DESTDIR)$(includedir)/%: include/% + $(INSTALL) -D -m 644 $< $@ -$(DESTDIR)$(syslibdir): - install -d -m 755 $(DESTDIR)$(syslibdir) +$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so + $(INSTALL) -D -l $(libdir)/libc.so $@ || true install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)