[git commit] libc.so: include all output formats in linker script

Steve Bennett steveb at workware.net.au
Sun Jun 28 17:16:42 UTC 2009


commit: http://git.uclibc.org/uClibc/commit/?id=e3d88875a4ec24982e26b1660c638c81f2623e7c
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl


Rather than ripping out the default output format from the linker, include
the big/little endian alternatives for the people who link with bi-endian
toolchains.

URL: http://lists.uclibc.org/pipermail/uclibc/2009-June/042595.html
Signed-off-by: Steve Bennett <steveb at workware.net.au>
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libc/Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libc/Makefile.in b/libc/Makefile.in
index 055351f..c4cf5d7 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -56,7 +56,7 @@ lib-gdb-y += $(top_builddir)lib/libc.gdb
 lib-so-y += $(libc.depend)
 objclean-y += libc_clean
 
-OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | $(SED) -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/OUTPUT_FORMAT ( \1 )/p'
+OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | $(SED) -n '/OUTPUT_FORMAT/,/)/p'
 
 ifeq ($(DOMULTI),n)
 $(libc.depend): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
@@ -67,7 +67,7 @@ $(libc.depend): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so)
 endif
 	$(Q)$(RM) $@
 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
-	$(Q)echo "$(shell $(OUTPUT_FORMAT))" >> $@
+	$(Q)$(OUTPUT_FORMAT) >> $@
 ifeq ($(COMPAT_ATEXIT),y)
 	$(Q)echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_MAJORNAME) $(ASNEEDED) )" >> $@
 else
-- 
1.6.3.3


More information about the uClibc-cvs mailing list