diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-29 03:51:02 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-29 03:51:02 +0000 |
| commit | 2d9da2f6be3e662889ef0e72759fe0f1a1495812 (patch) | |
| tree | 8305337a5a2dee0085b57e970426f15c8d96dac5 /libc | |
| parent | 52d5212ff513bcc37a2c146ac99a76fd93189372 (diff) | |
| download | uClibc-alpine-2d9da2f6be3e662889ef0e72759fe0f1a1495812.tar.bz2 uClibc-alpine-2d9da2f6be3e662889ef0e72759fe0f1a1495812.tar.xz | |
Merge from trunk that gives us a valid NPTL dynamic loader and the start of the new build system. I have probably another 300 and some files to go *sigh*.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Makefile.in | 24 | ||||
| -rw-r--r-- | libc/string/arm/strcmp.S | 1 |
2 files changed, 15 insertions, 10 deletions
diff --git a/libc/Makefile.in b/libc/Makefile.in index f65121c00..b03132256 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -15,7 +15,7 @@ endif LDFLAGS-libc.so := $(LDFLAGS) $(VERSION_SCRIPT) -init __uClibc_init -LIBS-libc.so := $(interp) $(top_builddir)lib/$(UCLIBC_LDSO) +LIBS-libc.so := $(interp) $(ldso) # we have SHARED_MAJORNAME=libc.so.$(MAJOR_VERSION) defined in Rules.mak libc_FULL_NAME := libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so @@ -39,13 +39,17 @@ include $(libc_DIR)/unistd/Makefile.in libc-a-y += $(libc-static-y) libc-so-y += $(libc-shared-y) +ifeq ($(DOPIC),y) +libc-a-y := $(libc-a-y:.o=.os) +endif + libc-nomulti-y += $(libc-shared-y) -lib-a-y += $(top_builddir)lib/libc.a crt-y -lib-so-y += libc-y $(top_builddir)lib/$(NONSHARED_LIBNAME) crt-y +lib-a-y += $(top_builddir)lib/libc.a +lib-so-y += $(libc) objclean-y += libc_clean -$(top_builddir)lib/libc.so: $(libc_OUT)/libc_so.a $(top_builddir)include/headers_done $(interp) +$(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc_so.a $(LIBS-libc.so) $(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION)) $(Q)$(RM) $@ $(Q)echo "/* GNU ld script" > $@ @@ -57,16 +61,16 @@ else $(Q)echo "GROUP ( $(SHARED_MAJORNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@ endif -$(libc_OUT)/libc_so.a: $(libc-so-y) +$(libc_OUT)/libc_so.a: $(libc-so-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME) $(Q)$(RM) $@ - $(do_strip) - $(do_ar) - ifeq ($(DOPIC),y) -$(top_builddir)lib/libc.a: $(libc-a-y:.o=.os) + $(Q)$(STRIPTOOL) $(STRIP_FLAGS) $(libc-shared-y) else -$(top_builddir)lib/libc.a: $(libc-a-y) + $(do_strip) endif + $(do_ar) + +$(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ $(do_strip) diff --git a/libc/string/arm/strcmp.S b/libc/string/arm/strcmp.S index e572cbe68..6913906ee 100644 --- a/libc/string/arm/strcmp.S +++ b/libc/string/arm/strcmp.S @@ -49,3 +49,4 @@ __strcmp: .size __strcmp,.-__strcmp .weak strcoll ; strcoll = strcmp +.global __strcoll ; __strcoll = strcoll |