aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Steve Bennett <steveb@workware.net.au>2009-06-28 13:16:42 -0400
committerGravatar Austin Foxley <austinf@cetoncorp.com>2009-07-09 01:30:12 -0700
commite3d88875a4ec24982e26b1660c638c81f2623e7c (patch)
tree9b9240056cddfb9fa950f4d5f71eea4ceb615d6c
parent0405bc756b7346049d5ba4dc6f0ef0295c9d6e8a (diff)
downloaduClibc-e3d88875a4ec24982e26b1660c638c81f2623e7c.tar.gz
uClibc-e3d88875a4ec24982e26b1660c638c81f2623e7c.tar.bz2
libc.so: include all output formats in linker script
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@workware.net.au> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
-rw-r--r--libc/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/Makefile.in b/libc/Makefile.in
index 055351f63..c4cf5d7c7 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