svn commit: branches/uClibc_0_9_29/libc

[vapier at uclibc.org]

Author: vapier
Date: 2008-01-05 09:36:08 -0800 (Sat, 05 Jan 2008)
New Revision: 20763

Log:
Merge r19838 by vapier from trunk:
setup OUTPUT_FORMAT() in linker script (helps with multilib)


Modified:
   branches/uClibc_0_9_29/libc/Makefile.in


Changeset:
Modified: branches/uClibc_0_9_29/libc/Makefile.in
===================================================================
--- branches/uClibc_0_9_29/libc/Makefile.in	2008-01-05 17:34:34 UTC (rev 20762)
+++ branches/uClibc_0_9_29/libc/Makefile.in	2008-01-05 17:36:08 UTC (rev 20763)
@@ -54,6 +54,8 @@
 lib-so-y += $(libc)
 objclean-y += libc_clean
 
+OUTPUT_FORMAT = $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p'
+
 ifeq ($(DOMULTI),n)
 $(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
 	$(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
@@ -64,6 +66,7 @@
 endif
 	$(Q)$(RM) $@
 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
+	$(Q)echo "OUTPUT_FORMAT ( $(shell $(OUTPUT_FORMAT)) )" >> $@
 ifeq ($(COMPAT_ATEXIT),y)
 	$(Q)echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_MAJORNAME) $(ASNEEDED) )" >> $@
 else