diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-06-23 22:13:47 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-06-23 22:13:47 -0400 |
| commit | ec05a0b08f0d93341c149a6f3235e4ee5711b2f8 (patch) | |
| tree | efcab9f79ced717da74e9877caa421502351c0c9 | |
| parent | b7f6e0c6f848b7a8c64b3f7b72014b48a9923729 (diff) | |
| download | musl-ec05a0b08f0d93341c149a6f3235e4ee5711b2f8.tar.gz musl-ec05a0b08f0d93341c149a6f3235e4ee5711b2f8.tar.xz musl-ec05a0b08f0d93341c149a6f3235e4ee5711b2f8.zip | |
adapt build/install/gcc-wrapper systems for dynamic linking support
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | dist/config.mak | 4 | ||||
| -rw-r--r-- | tools/gen-musl-gcc.sh | 5 |
3 files changed, 20 insertions, 9 deletions
diff --git a/Makefile b/Makefile index 5c176423..277aa00a 100644 --- a/Makefile +++ b/Makefile @@ -35,14 +35,15 @@ 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 @@ -74,7 +75,7 @@ include/bits/alltypes.h: include/bits/alltypes.h.sh %.lo: %.c $(GENH) $(CC) $(CFLAGS) $(INC) $(PIC) -c -o $@ $< -lib/libc.so: $(LOBJS) +lib/ld-musl-$(ARCH).so.1: $(LOBJS) $(CC) $(LDFLAGS) -o $@ $(LOBJS) -lgcc $(OBJCOPY) --weaken $@ @@ -91,15 +92,24 @@ 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: $(DESTDIR)/lib/ld-musl-$(ARCH).so.1 + echo 'GROUP ( /lib/ld-musl-$(ARCH).so.1 )' > $@ + .PRECIOUS: $(CRT_LIBS:lib/%=crt/%) .PHONY: all clean install diff --git a/dist/config.mak b/dist/config.mak index 66aa44cd..f0b8fd8f 100644 --- a/dist/config.mak +++ b/dist/config.mak @@ -20,5 +20,5 @@ exec_prefix = /usr/local # Uncomment for warnings (as errors). Might need tuning to your gcc version. #CFLAGS += -Werror -Wall -Wpointer-arith -Wcast-align -Wno-parentheses -Wno-char-subscripts -Wno-uninitialized -Wno-sequence-point -Wno-missing-braces -Wno-unused-value -Wno-overflow -Wno-int-to-pointer-cast -# Uncomment if you want to build a shared library (experimental). -#LIBC_LIBS += lib/libc.so +# Uncomment if you want to disable building the shared library. +#ALL_LDSO = diff --git a/tools/gen-musl-gcc.sh b/tools/gen-musl-gcc.sh index bf20c1f6..fcd1e4ea 100644 --- a/tools/gen-musl-gcc.sh +++ b/tools/gen-musl-gcc.sh @@ -1,6 +1,6 @@ #!/bin/sh -printf '#!/bin/sh\n\nlibc_prefix="%s"\n' "$1" +printf '#!/bin/sh\n\nlibc_prefix="%s"\narch="%s"\n' "$1" "$2" cat <<"EOF" libc_lib=$libc_prefix/lib @@ -27,5 +27,6 @@ done exec "$0" "$@" ' -std=gnu99 -nostdinc -nostdlib \ -isystem "$libc_inc" -isystem "$gcc_inc" \ - -Wl,-xxxxxx "$@" -L"$libc_lib" -lc -L"$libgcc" -lgcc -Lxxxxxx -Wl,-nostdlib + -Wl,-xxxxxx "$@" -L"$libc_lib" -lc -L"$libgcc" -lgcc -Lxxxxxx \ + -Wl,-dynamic-linker /lib/ld-musl-"$arch".so.1 -Wl,-nostdlib EOF |