From f4eebb6146ea3f6917481d5d24f3d99e97236399 Mon Sep 17 00:00:00 2001 From: "Bernd Schmidt bernds_cb1@t-online.de" Date: Wed, 2 Mar 2011 18:22:01 +0100 Subject: Add Makefile support for DSBT ELF. This adds support for a new binary format, DSBT ELF, to the Makefiles. Every shared library is assigned a DSBT index, and the link.so macro is adjusted to ensure the correct linker argument is passed. Configuration and ldso support will follow in separate commits. Signed-off-by: Bernd Schmidt Signed-off-by: Bernhard Reutner-Fischer --- Makerules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index 84eeaea19..3a4d566d4 100644 --- a/Makerules +++ b/Makerules @@ -297,7 +297,8 @@ cmd_hcompile.o = $(HOSTCC) $(filter-out $(PHONY),$<) $(DEPS-$(notdir $@)) -c -o define link.so $(Q)$(RM) $@ $@.$(2) $(dir $@)$(1) @$(disp_ld) - $(Q)$(CC) $(LDFLAGS-$(notdir $@)) -Wl,-soname=$(notdir $@).$(2) \ + $(Q)$(CC) $(LDFLAGS-$(notdir $@)) $(LDFLAGS-y-$(@F)) \ + -Wl,-soname=$(notdir $@).$(2) \ $(NOSTDLIB_CFLAGS) -o $(dir $@)$(1) $(START_FILE-$(notdir $@)) \ -Wl,--whole-archive $(firstword $^) -Wl,--no-whole-archive \ $(LIBS-$(notdir $@)) $(LIBGCC) $(END_FILE-$(notdir $@)) -- cgit v1.2.3 From 5dffed7dd1a413f3965af702fa7ecd79809d1988 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 8 Mar 2011 12:56:13 +0100 Subject: Makerules: respect HARDWIRED_ABSPATH in interp.c Build LDSO path according to the HARDWIRED_ABSPATH setting While there, remove duplicated slashes in interp.c Signed-off-by: Peter S. Mazinger --- Makerules | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makerules') diff --git a/Makerules b/Makerules index 3a4d566d4..f045e527f 100644 --- a/Makerules +++ b/Makerules @@ -364,8 +364,14 @@ $(top_builddir)%.dep: $(top_builddir)lib/interp.c: | $(top_builddir)lib $(Q)echo "/* Force shared libraries to know about the correct library loader */" > $@.tmp $(Q)echo "#include " >> $@.tmp +ifeq ($(HARDWIRED_ABSPATH),y) $(Q)echo "const char __dl_ldso__[] attribute_hidden __attribute__ ((weak)) __attribute__ ((section " \ "(\".interp\"))) =\""$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UCLIBC_LDSO)"\";" >> $@.tmp + $(Q)$(SED) -i -e 's://:/:g' $@.tmp +else + $(Q)echo "const char __dl_ldso__[] attribute_hidden __attribute__ ((weak)) __attribute__ ((section " \ + "(\".interp\"))) =\""$(UCLIBC_LDSO)"\";" >> $@.tmp +endif $(Q)mv $@.tmp $@ $(interp): $(top_builddir)lib/interp.c | $(sub_headers) -- cgit v1.2.3