aboutsummaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules13
1 files changed, 3 insertions, 10 deletions
diff --git a/Makerules b/Makerules
index 0b30061..06c7c48 100644
--- a/Makerules
+++ b/Makerules
@@ -1065,20 +1065,13 @@ install: $(inst_slibdir)/libc.so$(libc.so-version)
# for the configuration we are building. We put this statement into
# the linker scripts we install for -lc et al so that they will not be
# used by a link for a different format on a multi-architecture system.
-$(common-objpfx)format.lds: $(..)scripts/output-format.sed \
- $(common-objpfx)config.make \
+$(common-objpfx)format.lds: $(common-objpfx)config.make \
$(common-objpfx)config.h $(..)Makerules
-ifneq (unknown,$(output-format))
- echo > $@.new 'OUTPUT_FORMAT($(output-format))'
-else
$(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \
$(LDFLAGS.so) $(LDFLAGS-lib.so) \
- -x c /dev/null -o $@.so -Wl,--verbose -v 2>/dev/null \
- | sed -n -f $< > $@.new
- test -s $@.new
+ -x c /dev/null -o $@.so 2>/dev/null
+ $(OBJDUMP) -f $@.so | sed -n 's/.*file format \(.*\)/OUTPUT_FORMAT(\1)/;T;p' > $@
rm -f $@.so
-endif
- mv -f $@.new $@
common-generated += format.lds
ifndef subdir