diff options
| author | Chris Zankel <chris@zankel.net> | 2008-02-11 23:16:35 +0000 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2008-02-11 23:16:35 +0000 |
| commit | 07fe29fb136025431135193917a3054620a74b3d (patch) | |
| tree | 463ca1754aaae4c1df686a963a8c860a3d030b08 | |
| parent | bd2b38e3cde5aa7d6d54933ee1b82180fd8d7a75 (diff) | |
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@zankel.net>
| -rw-r--r-- | libc/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/Makefile.in b/libc/Makefile.in index 2ef407bfb..e5443cfd3 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -54,7 +54,7 @@ lib-gdb-y += $(top_builddir)lib/libc.gdb 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 @@ $(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIB 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 |