clean up pow.c and powf.c

[musl] / Makefile

diff --git a/Makefile b/Makefile
index 5c17642..7906c52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ bindir = $(exec_prefix)/bin
 prefix = /usr/local/musl
 includedir = $(prefix)/include
 libdir = $(prefix)/lib
+syslibdir = /lib
 
 SRCS = $(sort $(wildcard src/*/*.c))
 OBJS = $(SRCS:.c=.o)
@@ -22,7 +23,7 @@ GENH = include/bits/alltypes.h
 
 CFLAGS  = -Os -nostdinc -ffreestanding -std=c99 -D_XOPEN_SOURCE=700 -pipe
 LDFLAGS = -nostdlib -shared -fPIC -Wl,-e,_start -Wl,-Bsymbolic-functions
-INC     = -I./include -I./src/internal -I./arch/$(ARCH)
+INC     = -I./src/internal -I./include -I./arch/$(ARCH)
 PIC     = -fPIC -O3
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
@@ -33,16 +34,18 @@ ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH))
 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)
-
+STATIC_LIBS = lib/libc.a $(EMPTY_LIBS)
+SHARED_LIBS = lib/libc.so
+ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS)
 ALL_TOOLS = tools/musl-gcc
 
+LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH).so.1
+
 -include config.mak
 
 all: $(ALL_LIBS) $(ALL_TOOLS)
 
-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)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
 
 clean:
        rm -f crt/*.o
@@ -75,7 +78,7 @@ include/bits/alltypes.h: include/bits/alltypes.h.sh
        $(CC) $(CFLAGS) $(INC) $(PIC) -c -o $@ $<
 
 lib/libc.so: $(LOBJS)
-       $(CC) $(LDFLAGS) -o $@ $(LOBJS) -lgcc
+       $(CC) $(LDFLAGS) -Wl,-soname=libc.so -o $@ $(LOBJS) -lgcc
        $(OBJCOPY) --weaken $@
 
 lib/libc.a: $(OBJS)
@@ -91,15 +94,25 @@ lib/%.o: crt/%.o
        cp $< $@
 
 tools/musl-gcc: tools/gen-musl-gcc.sh config.mak
-       sh $< "$(prefix)" > $@ || { rm -f $@ ; exit 1 ; }
+       sh $< "$(prefix)" "$(LDSO_PATHNAME)" > $@ || { rm -f $@ ; exit 1 ; }
        chmod +x $@
 
 $(DESTDIR)$(bindir)/%: tools/%
        install -D $< $@
 
-$(DESTDIR)$(prefix)/%: %
+$(DESTDIR)$(libdir)/%.so: lib/%.so
+       install -D -m 755 $< $@
+
+$(DESTDIR)$(libdir)/%: lib/%
        install -D -m 644 $< $@
 
+$(DESTDIR)$(includedir)/%: include/%
+       install -D -m 644 $< $@
+
+$(DESTDIR)$(LDSO_PATHNAME): lib/libc.so
+       install -d -m 755 $(DESTDIR)$(syslibdir) || true
+       ln -sf $(libdir)/libc.so $@ || true
+
 .PRECIOUS: $(CRT_LIBS:lib/%=crt/%)
 
 .PHONY: all clean install