From 5e48b8b628e885ffd0772c991a6efa5a74946b9e Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 19 Oct 2005 20:19:47 +0000 Subject: Add the current implementation to review --- Makefile.libs | 37 +++++++++++++++++++------------ Makerules | 2 +- ldso/ldso/Makefile.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ ldso/libdl/Makefile.in | 21 +++++++++--------- libintl/Makefile.in | 23 ++++++++++++++++++++ libnsl/Makefile.in | 16 ++++++++++++++ libresolv/Makefile.in | 16 ++++++++++++++ librt/Makefile.in | 16 ++++++++++++++ libutil/Makefile.in | 21 ++++++++++++++++++ 9 files changed, 186 insertions(+), 25 deletions(-) create mode 100644 ldso/ldso/Makefile.in create mode 100644 libintl/Makefile.in create mode 100644 libnsl/Makefile.in create mode 100644 libresolv/Makefile.in create mode 100644 librt/Makefile.in create mode 100644 libutil/Makefile.in diff --git a/Makefile.libs b/Makefile.libs index 01c69e422..b76f8c2b8 100644 --- a/Makefile.libs +++ b/Makefile.libs @@ -31,6 +31,8 @@ $(LIB_NAME)_OBJ_PIC:=$(patsubst %.o,%.os,$($(LIB_NAME)_OBJ)) $(LIB_NAME)_MOBJ_PIC:=$(patsubst %.o,%.os,$($(LIB_NAME)_MOBJ)) +$(LIB_NAME)_SOBJ_PIC:=$(patsubst %.o,%.os,$($(LIB_NAME)_SOBJ)) + #libso-y+=$(top_builddir)lib/$(LIB_NAME).so #liba-y+=$(top_builddir)lib/$(LIB_NAME).a #libclean-y+=$(LIB_NAME)_clean @@ -47,49 +49,56 @@ $($(LIB_NAME)_MOBJ): $($(LIB_NAME)_MSRC) $($(LIB_NAME)_MOBJ_PIC): $($(LIB_NAME)_MSRC) $(compile.m) $(PICFLAG) +$($(LIB_NAME)_SOBJ): %.o : %.S + $(compile.S) + +$($(LIB_NAME)_SOBJ_PIC): %.os : %.S + $(compile.S) $(PICFLAG) + # this should be changed to .os after libc/misc/internals/ is done +libc:=$(top_builddir)lib/libc.so interp:=$(top_builddir)libc/misc/internals/interp.o ifeq ($(strip $(EXTRA_LINK_LIBS)),) -EXTRA_LINK_LIBS=$(interp) -L$(top_builddir)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) +#EXTRA_LINK_LIBS:=$(interp) -L$(top_builddir)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) +EXTRA_LINK_LIBS:=$(interp) $(libc) $(LDADD_LIBFLOAT) $(LIBGCC) endif -$(top_builddir)lib/$(LIB_NAME).so: $($(LIB_NAME)_DIR)/$(LIB_NAME)_pic.a $(interp) +$(top_builddir)lib/$(LIB_NAME).so: $($(LIB_NAME)_DIR)/$(LIB_NAME)_pic.a $(interp) $(libc) $(INSTALL) -d $(top_builddir)lib $(RM) $@ $@.$(MAJOR_VERSION) $(top_builddir)lib/$($(LIB_NAME)_FULL_NAME) - $(LD) $(LDFLAGS) -soname=$(notdir $@).$(MAJOR_VERSION) -o $(top_builddir)lib/$($(LIB_NAME)_FULL_NAME) \ - $(EXTRA_LINK_OPTS) $(SHARED_START_FILES) --whole-archive $(firstword $^) \ - --no-whole-archive $(EXTRA_LINK_LIBS) $(SHARED_END_FILES) + $(LD) $(LDFLAGS) $(EXTRA_LINK_OPTS) -soname=$(notdir $@).$(MAJOR_VERSION) \ + -o $(top_builddir)lib/$($(LIB_NAME)_FULL_NAME) $(SHARED_START_FILES) \ + --whole-archive $(firstword $^) --no-whole-archive \ + $(EXTRA_LINK_LIBS) $(SHARED_END_FILES) $(LN) -sf $($(LIB_NAME)_FULL_NAME) $@.$(MAJOR_VERSION) $(LN) -sf $($(LIB_NAME)_FULL_NAME) $@ -$(top_builddir)lib/$(LIB_NAME).so1: $($(LIB_NAME)_OBJ_PIC) $($(LIB_NAME)_MOBJ_PIC) +$(top_builddir)lib/$(LIB_NAME).so1: $($(LIB_NAME)_OBJ_PIC) $($(LIB_NAME)_MOBJ_PIC) $($(LIB_NAME)_SOBJ_PIC) $($(LIB_NAME)_SO_ADD) $(INSTALL) -d $(top_builddir)lib $(RM) $@ $@.$(MAJOR_VERSION) $(top_builddir)lib/$($(LIB_NAME)_FULL_NAME) - $(LD) $(LDFLAGS) -soname=$(notdir $@).$(MAJOR_VERSION) -o $(top_builddir)lib/$($(LIB_NAME)_FULL_NAME) \ - $(EXTRA_LINK_OPTS) $(SHARED_START_FILES) $^ \ + $(LD) $(LDFLAGS) $(EXTRA_LINK_OPTS) -soname=$(notdir $@).$(MAJOR_VERSION) \ + -o $(top_builddir)lib/$($(LIB_NAME)_FULL_NAME) $(SHARED_START_FILES) $^ \ $(EXTRA_LINK_LIBS) $(SHARED_END_FILES) $(LN) -sf $($(LIB_NAME)_FULL_NAME) $@.$(MAJOR_VERSION) $(LN) -sf $($(LIB_NAME)_FULL_NAME) $@ -$($(LIB_NAME)_DIR)/$(LIB_NAME)_pic.a: $($(LIB_NAME)_OBJ_PIC) $($(LIB_NAME)_MOBJ_PIC) -ifneq ($(strip $(STRIP_FLAGS)),) - $(STRIPTOOL) $(STRIP_FLAGS) $^ +$($(LIB_NAME)_DIR)/$(LIB_NAME)_pic.a: $($(LIB_NAME)_OBJ_PIC) $($(LIB_NAME)_MOBJ_PIC) $($(LIB_NAME)_SOBJ_PIC) $($(LIB_NAME)_SO_ADD) +ifneq ($(strip $($(LIB_NAME)_STRIP_FLAGS)),) + $(STRIPTOOL) $($(LIB_NAME)_STRIP_FLAGS) $^ else $(STRIPTOOL) -x -R .note -R .comment $^ endif $(AR) $(ARFLAGS) $@ $^ - #(AR) $(ARFLAGS) $@ $($(LIB_NAME)_OBJ_PIC) $($(LIB_NAME)_MOBJ_PIC) ifeq ($(DOPIC),y) $(top_builddir)lib/$(LIB_NAME).a: $($(LIB_NAME)_DIR)/$(LIB_NAME)_pic.a $(RM) $@ cp $< $@ else -$(top_builddir)lib/$(LIB_NAME).a: $($(LIB_NAME)_OBJ) $($(LIB_NAME)_MOBJ) +$(top_builddir)lib/$(LIB_NAME).a: $($(LIB_NAME)_OBJ) $($(LIB_NAME)_MOBJ) $($(LIB_NAME)_SOBJ) $($(LIB_NAME)_A_ADD) $(RM) $@ $(STRIPTOOL) -x -R .note -R .comment $^ $(AR) $(ARFLAGS) $@ $^ - #(AR) $(ARFLAGS) $@ $($(LIB_NAME)_OBJ) $($(LIB_NAME)_MOBJ) endif $(LIB_NAME)_clean: diff --git a/Makerules b/Makerules index 29d407040..e165bf531 100644 --- a/Makerules +++ b/Makerules @@ -1,7 +1,7 @@ # # Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. # -.SUFFIXES: .c .S .o .os .so .a .s +.SUFFIXES: .c .S .o .os .so .a .s .i ifndef top_srcdir top_srcdir=$(CURDIR) diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in new file mode 100644 index 000000000..a272e771b --- /dev/null +++ b/ldso/ldso/Makefile.in @@ -0,0 +1,59 @@ +# Makefile for uClibc +# +# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. +# + +LIB_NAME:=ld-uClibc + +# psm: I do not know if the order of includes is relevant +# to be sure I have put them first +CFLAGS:=-I$(top_srcdir)ldso/include -I. $(CFLAGS) $(PICFLAG) $(SSP_DISABLE_FLAGS) + +CFLAGS+=-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" + +ifeq ($(SUPPORT_LD_DEBUG),y) +CFLAGS+=-D__SUPPORT_LD_DEBUG__ +endif + +ifeq ($(SUPPORT_LD_DEBUG_EARLY),y) +CFLAGS+=-D__SUPPORT_LD_DEBUG_EARLY__ +endif + +ifeq ($(DODEBUG),y) +# Not really much point in including debugging info, since gdb +# can't really debug ldso, since gdb requires help from ldso to +# debug things.... +# psm: keep this in sync w/ Rules.mak +CFLAGS:=$(CFLAGS:-O0 -g3=-Os -g) +endif + +# BEWARE!!! At least mips* will die if -O0 is used!!! +ifeq ($(TARGET_ARCH),mips) +CFLAGS:=$(CFLAGS:-O0=-O1) +endif + +# This stuff will not work with -fomit-frame-pointer +CFLAGS:=$(CFLAGS:-fomit-frame-pointer=) + +ifeq ($(SUPPORT_LD_DEBUG),y) +LDFLAGS:=$(LDFLAGS_NOSTRIP) +endif + +srcdir=$(top_srcdir)ldso/ldso +$(LIB_NAME)_DIR:=$(top_builddir)ldso/ldso + +$(LIB_NAME)_SRC:=$(srcdir)/ldso.c + +$(LIB_NAME)_SSRC:=$(wildcard $(srcdir)/$(TARGET_ARCH)/*.S) +$(LIB_NAME)_SOBJ:=$(patsubst $(srcdir)/$(TARGET_ARCH)/%.S,$($(LIB_NAME)_DIR)/$(TARGET_ARCH)/%.o,$($(LIB_NAME)_SSRC)) + +EXTRA_LINK_OPTS:=-e _start -z now -Bsymbolic --export-dynamic --sort-common --discard-locals --discard-all --no-undefined +EXTRA_LINK_LIBS:=$(LIBGCC) # $(LDADD_LIBFLOAT) + +libso-$(HAVE_SHARED)+=$(top_builddir)lib/$(LIB_NAME).so +libclean-y+=$(LIB_NAME)_clean $(LIB_NAME)_arch_clean + +$(LIB_NAME)_arch_clean: + $(RM) $($(LIB_NAME)_DIR)/*/*.{o,os} + +include $(top_srcdir)Makefile.libs diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index b3dca7d9c..389484e9b 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -3,7 +3,13 @@ # Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. # -CFLAGS+=$(SSP_ALL_CFLAGS) -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" +LIB_NAME:=libdl + +# psm: I do not know if the order of includes is relevant +# to be sure I added them first +CFLAGS:=-I$(top_builddir)ldso/include -I$(top_builddir)ldso/ldso $(CFLAGS) $(SSP_ALL_CFLAGS) + +CFLAGS+=-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" ifeq ($(SUPPORT_LD_DEBUG),y) CFLAGS+=-D__SUPPORT_LD_DEBUG__ @@ -14,30 +20,28 @@ ifeq ($(TARGET_ARCH),mips) CFLAGS:=$(CFLAGS:-O0=-O1) endif -CFLAGS:=-I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso $(CFLAGS) - CFLAGS-.os=-DSHARED # we adapt CFLAGS, because libdl.a has an additional object ifeq ($(DOPIC),y) CFLAGS-.o=$(PICFLAG) -resolv:=$(top_builddir)ldso/$(TARGET_ARCH)/resolv.os +resolv:=$(top_builddir)ldso/ldso/$(TARGET_ARCH)/resolve.os else -resolv:=$(top_builddir)ldso/$(TARGET_ARCH)/resolv.o +resolv:=$(top_builddir)ldso/ldso/$(TARGET_ARCH)/resolve.o endif EXTRA_LINK_OPTS:=-fini dl_cleanup -#EXTRA_LINK_LIBS:=$(interp) -L$(top_builddir)lib -lc $(LDADD_LIBFLOAT) $(top_builddir)lib/$(UCLIBC_LDSO) $(LIBGCC) # we need for all cases a "full" libdl.a the pic version used to build libdl.so misses $(resolv) # because it is linked against ld.so DOPIC=n -LIB_NAME:=libdl srcdir=$(top_srcdir)ldso/$(LIB_NAME) $(LIB_NAME)_DIR:=$(top_builddir)ldso/$(LIB_NAME) $(LIB_NAME)_SRC:=$(srcdir)/libdl.c +$(LIB_NAME)_A_ADD:=$(resolv) + libso-$(HAVE_SHARED)+=$(top_builddir)lib/$(LIB_NAME).so liba-$(HAVE_SHARED)+=$(top_builddir)lib/$(LIB_NAME).a libclean-y+=$(LIB_NAME)_clean @@ -46,6 +50,3 @@ include $(top_srcdir)Makefile.libs # !!! these lines have to come after including Makefile.libs !!! EXTRA_LINK_LIBS+=$(top_builddir)lib/$(UCLIBC_LDSO) - -# should only go into libdl.a, OBJ_PIC is not modified here -$(LIB_NAME)_OBJ+=$(resolv) diff --git a/libintl/Makefile.in b/libintl/Makefile.in new file mode 100644 index 000000000..cb0627dd7 --- /dev/null +++ b/libintl/Makefile.in @@ -0,0 +1,23 @@ +# Makefile.in for uClibc +# +# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. +# + +CFLAGS+=$(SSP_ALL_CFLAGS) + +LIB_NAME:=libintl + +srcdir=$(top_srcdir)$(LIB_NAME) +$(LIB_NAME)_DIR:=$(top_builddir)$(LIB_NAME) + +$(LIB_NAME)_MSRC:=$(srcdir)/intl.c +MOBJ:=gettext.o ngettext.o dgettext.o dcgettext.o dngettext.o dcngettext.o \ + textdomain.o bindtextdomain.o bind_textdomain_codeset.o \ + _nl_expand_alias.o _nl_msg_cat_cntr.o # glibc-isms +$(LIB_NAME)_MOBJ:=$(patsubst %.o,$($(LIB_NAME)_DIR)/%.o,$(MOBJ)) + +libso-$(UCLIBC_HAS_GETTEXT_AWARENESS)+=$(top_builddir)lib/$(LIB_NAME).so +liba-$(UCLIBC_HAS_GETTEXT_AWARENESS)+=$(top_builddir)lib/$(LIB_NAME).a +libclean-y+=$(LIB_NAME)_clean + +include $(top_srcdir)Makefile.libs diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in new file mode 100644 index 000000000..678e4c530 --- /dev/null +++ b/libnsl/Makefile.in @@ -0,0 +1,16 @@ +# Makefile.in for uClibc +# +# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. +# + +CFLAGS+=$(SSP_ALL_CFLAGS) + +LIB_NAME:=libnsl + +srcdir=$(top_srcdir)$(LIB_NAME) + +libso-y+=$(top_builddir)lib/$(LIB_NAME).so +liba-y+=$(top_builddir)lib/$(LIB_NAME).a +libclean-y+=$(LIB_NAME)_clean + +include $(top_srcdir)Makefile.libs diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in new file mode 100644 index 000000000..b4d03fe66 --- /dev/null +++ b/libresolv/Makefile.in @@ -0,0 +1,16 @@ +# Makefile.in for uClibc +# +# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. +# + +CFLAGS+=$(SSP_ALL_CFLAGS) + +LIB_NAME:=libresolv + +srcdir=$(top_srcdir)$(LIB_NAME) + +libso-y+=$(top_builddir)lib/$(LIB_NAME).so +liba-y+=$(top_builddir)lib/$(LIB_NAME).a +libclean-y+=$(LIB_NAME)_clean + +include $(top_srcdir)Makefile.libs diff --git a/librt/Makefile.in b/librt/Makefile.in new file mode 100644 index 000000000..7f3a311a3 --- /dev/null +++ b/librt/Makefile.in @@ -0,0 +1,16 @@ +# Makefile.in for uClibc +# +# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. +# + +CFLAGS+=$(SSP_ALL_CFLAGS) + +LIB_NAME:=librt + +srcdir=$(top_srcdir)$(LIB_NAME) + +libso-y+=$(top_builddir)lib/$(LIB_NAME).so +liba-y+=$(top_builddir)lib/$(LIB_NAME).a +libclean-y+=$(LIB_NAME)_clean + +include $(top_srcdir)Makefile.libs diff --git a/libutil/Makefile.in b/libutil/Makefile.in new file mode 100644 index 000000000..8c5846400 --- /dev/null +++ b/libutil/Makefile.in @@ -0,0 +1,21 @@ +# Makefile.in for uClibc +# +# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details. +# + +CFLAGS+=$(SSP_ALL_CFLAGS) + +LIB_NAME:=libutil + +srcdir=$(top_srcdir)$(LIB_NAME) + +$(LIB_NAME)_SRC:=$(wildcard $(srcdir)/*.c) +ifneq ($(ARCH_HAS_MMU),y) +$(LIB_NAME)_SRC:=$(filter-out $(srcdir)/forkpty.c,$($(LIB_NAME)_SRC)) +endif + +libso-y+=$(top_builddir)lib/$(LIB_NAME).so +liba-y+=$(top_builddir)lib/$(LIB_NAME).a +libclean-y+=$(LIB_NAME)_clean + +include $(top_srcdir)Makefile.libs -- cgit v1.2.3