OSDN Git Service

libc.so: include all output formats in linker script
authorSteve Bennett <steveb@workware.net.au>
Sun, 28 Jun 2009 17:16:42 +0000 (13:16 -0400)
committerMike Frysinger <vapier@gentoo.org>
Sun, 28 Jun 2009 17:16:42 +0000 (13:16 -0400)
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>
libc/Makefile.in

index 16768db..7297e92 100644 (file)
@@ -54,7 +54,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)
@@ -65,7 +65,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