fix powerpc MCL_* mlockall flags in bits/mman.h

[musl] / Makefile

diff --git a/Makefile b/Makefile
index 7849c93..3a60cfc 100644 (file)
--- 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/*.[csS]))
+BASE_SRCS = $(sort $(wildcard $(srcdir)/src/*/*.c))
 BASE_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(BASE_SRCS)))
 ARCH_SRCS = $(wildcard $(srcdir)/src/*/$(ARCH)/*.[csS])
 ARCH_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(ARCH_SRCS)))
@@ -82,13 +82,7 @@ $(OBJ_DIRS):
 install: install-libs install-headers install-tools
 
 clean:
-       rm -f obj/crt/*.o obj/crt/$(ARCH)/*.o
-       rm -f $(OBJS)
-       rm -f $(LOBJS)
-       rm -f $(ALL_LIBS) lib/*.[ao] lib/*.so
-       rm -f $(ALL_TOOLS)
-       rm -f $(GENH) $(GENH_INT)
-       rm -f obj/include/bits/alltypes.h
+       rm -rf obj lib
 
 distclean: clean
        rm -f config.mak
@@ -130,30 +124,32 @@ $(CRT_LIBS:lib/%=obj/crt/%): CFLAGS_ALL += -DCRT
 
 $(LOBJS): CFLAGS_ALL += -fPIC -DSHARED
 
+CC_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $<
+
 # Choose invocation of assembler to be used
 ifeq ($(ADD_CFI),yes)
        AS_CMD = LC_ALL=C awk -f $(srcdir)/tools/add-cfi.common.awk -f $(srcdir)/tools/add-cfi.$(ARCH).awk $< | $(CC) $(CFLAGS_ALL) -x assembler -c -o $@ -
 else
-       AS_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $<
+       AS_CMD = $(CC_CMD)
 endif
 
 obj/%.o: $(srcdir)/%.s
-       $(AS_CMD) $(CFLAGS_ALL)
+       $(AS_CMD)
 
 obj/%.o: $(srcdir)/%.S
-       $(CC) $(CFLAGS_ALL) -c -o $@ $<
+       $(CC_CMD)
 
 obj/%.o: $(srcdir)/%.c $(GENH) $(IMPH)
-       $(CC) $(CFLAGS_ALL) -c -o $@ $<
+       $(CC_CMD)
 
 obj/%.lo: $(srcdir)/%.s
-       $(AS_CMD) $(CFLAGS_ALL)
+       $(AS_CMD)
 
 obj/%.lo: $(srcdir)/%.S
-       $(CC) $(CFLAGS_ALL) -c -o $@ $<
+       $(CC_CMD)
 
 obj/%.lo: $(srcdir)/%.c $(GENH) $(IMPH)
-       $(CC) $(CFLAGS_ALL) -c -o $@ $<
+       $(CC_CMD)
 
 lib/libc.so: $(LOBJS)
        $(CC) $(CFLAGS_ALL) $(LDFLAGS_ALL) -nostdlib -shared \