X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=Makefile;h=7185b83c5ca35bad9e882e39de333f4725eba7ae;hp=13a24e3c1e506d9f107bfa45ed7a192f74a6a0bd;hb=e0b0ff1598ff747713631224a54e63af70761a71;hpb=7b2dd2235dd0db3a2f71e25d1c0925e0348e1996

diff --git a/Makefile b/Makefile
index 13a24e3c..7185b83c 100644
--- a/Makefile
+++ b/Makefile
@@ -21,39 +21,41 @@ LOBJS = $(OBJS:.o=.lo)
 GENH = include/bits/alltypes.h
 
 CFLAGS  = -Os -nostdinc -ffreestanding -std=c99 -D_XOPEN_SOURCE=700 -pipe
-LDFLAGS = -nostdlib -shared -Wl,-Bsymbolic
+LDFLAGS = -nostdlib -shared -fPIC -Wl,-e,_start -Wl,-Bsymbolic-functions
 INC     = -I./include -I./src/internal -I./arch/$(ARCH)
-PIC     = -fPIC
+PIC     = -fPIC -O3
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
 OBJCOPY = $(CROSS_COMPILE)objcopy
 
 ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH))
 
-EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv
+EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl
 EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
 CRT_LIBS = lib/crt1.o lib/crti.o lib/crtn.o
 LIBC_LIBS = lib/libc.a
 ALL_LIBS = $(LIBC_LIBS) $(CRT_LIBS) $(EMPTY_LIBS)
+ALL_LDSO = lib/ld-musl-$(ARCH).so.1
 
 ALL_TOOLS = tools/musl-gcc
 
 -include config.mak
 
-all: $(ALL_LIBS) $(ALL_TOOLS)
+all: $(ALL_LIBS) $(ALL_TOOLS) $(ALL_LDSO)
 
-install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%)
+install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%) $(ALL_LDSO:%=$(DESTDIR)/%) $(ALL_LDSO:%/ld-musl-$(ARCH).so.1=$(DESTDIR)$(libdir)/libc.so)
 
 clean:
 	rm -f crt/*.o
 	rm -f $(OBJS)
 	rm -f $(LOBJS)
-	rm -f $(ALL_LIBS) lib/*
+	rm -f $(ALL_LIBS) lib/*.[ao] lib/*.so
 	rm -f $(ALL_TOOLS)
 	rm -f $(GENH) 
 	rm -f include/bits
 
 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
@@ -73,8 +75,8 @@ include/bits/alltypes.h: include/bits/alltypes.h.sh
 %.lo: %.c $(GENH)
 	$(CC) $(CFLAGS) $(INC) $(PIC) -c -o $@ $<
 
-lib/libc.so: $(LOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(LOBJS) -lgcc
+lib/ld-musl-$(ARCH).so.1: $(LOBJS)
+	$(CC) $(LDFLAGS) -Wl,-soname=libc.so.1 -o $@ $(LOBJS) -lgcc
 	$(OBJCOPY) --weaken $@
 
 lib/libc.a: $(OBJS)
@@ -83,21 +85,31 @@ lib/libc.a: $(OBJS)
 	$(RANLIB) $@
 
 $(EMPTY_LIBS):
+	rm -f $@
 	$(AR) rc $@
 
 lib/%.o: crt/%.o
 	cp $< $@
 
 tools/musl-gcc: tools/gen-musl-gcc.sh config.mak
-	sh $< "$(prefix)" > $@ || { rm -f $@ ; exit 1 ; }
+	sh $< "$(prefix)" "$(ARCH)" > $@ || { rm -f $@ ; exit 1 ; }
 	chmod +x $@
 
 $(DESTDIR)$(bindir)/%: tools/%
 	install -D $< $@
 
-$(DESTDIR)$(prefix)/%: %
+$(DESTDIR)$(libdir)/%: lib/%
+	install -D -m 644 $< $@
+
+$(DESTDIR)$(includedir)/%: include/%
 	install -D -m 644 $< $@
 
+$(DESTDIR)/lib/ld-musl-$(ARCH).so.1: lib/ld-musl-$(ARCH).so.1
+	install -D -m 755 $< $@
+
+$(DESTDIR)$(libdir)/libc.so: lib/ld-musl-$(ARCH).so.1
+	ln -sf /lib/ld-musl-$(ARCH).so.1 $@
+
 .PRECIOUS: $(CRT_LIBS:lib/%=crt/%)
 
 .PHONY: all clean install