svn commit: trunk/uClibc/libc

czankel at uclibc.org czankel at uclibc.org
Mon Feb 11 23:16:36 UTC 2008


Author: czankel
Date: 2008-02-11 15:16:35 -0800 (Mon, 11 Feb 2008)
New Revision: 20985

Log:
Omit adding 'OUTPUT_FORMAT' to the libc.so linker script if the architecture
didn't provide one (Xtensa, for example, is such an architecture).

Signed-off-by: Chris Zankel <chris at zankel.net>


Modified:
   trunk/uClibc/libc/Makefile.in


Changeset:
Modified: trunk/uClibc/libc/Makefile.in
===================================================================
--- trunk/uClibc/libc/Makefile.in	2008-02-11 18:10:06 UTC (rev 20984)
+++ trunk/uClibc/libc/Makefile.in	2008-02-11 23:16:35 UTC (rev 20985)
@@ -54,7 +54,7 @@
 lib-so-y += $(libc)
 objclean-y += libc_clean
 
-OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p'
+OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/OUTPUT_FORMAT ( \1 )/p'
 
 ifeq ($(DOMULTI),n)
 $(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
@@ -66,7 +66,7 @@
 endif
 	$(Q)$(RM) $@
 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
-	$(Q)echo "OUTPUT_FORMAT ( $(shell $(OUTPUT_FORMAT)) )" >> $@
+	$(Q)echo "$(shell $(OUTPUT_FORMAT))" >> $@
 ifeq ($(COMPAT_ATEXIT),y)
 	$(Q)echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_MAJORNAME) $(ASNEEDED) )" >> $@
 else




More information about the uClibc-cvs mailing list