[glibc/maskray/lld] install: Delete scripts/output-format.sed and support lld

[glibc/maskray/lld] install: Delete scripts/output-format.sed and support lld

[Fangrui Song]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f9b0cc50cee153a67291dc2b94e9a00d48b3298

commit 2f9b0cc50cee153a67291dc2b94e9a00d48b3298
Author: Fangrui Song <maskray@google.com>
Date:   Sat Apr 11 15:54:56 2020 -0700

    install: Delete scripts/output-format.sed and support lld
    
    GNU ld and gold have supported --print-output-format since 2011. glibc
    requires binutils>=2.25 (2015), so if LD is GNU ld or gold, we can
    assume the option is supported.
    
    lld is by default a cross linker supporting multiple targets. It auto
    detects the file format and does not need OUTPUT_FORMAT. It does not
    support --print-output-format, so we can repurpose the
    output-format=unknown branch to make format.lds empty.
    
    GNU ld and gold can skip a script with incompatible OUTPUT_FORMAT and
    find the next script in the search path. So libc.so linked with lld
    cannot be skipped automatically. However, this is considered a minor
    functionality loss by lld maintainers.

Diff:
---
 Makerules                                      | 12 +++------
 benchtests/strcoll-inputs/filelist#en_US.UTF-8 |  1 -
 scripts/output-format.sed                      | 35 --------------------------
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/Makerules b/Makerules
index ef0fe67d9a..375e733200 100644
--- a/Makerules
+++ b/Makerules
@@ -1065,18 +1065,14 @@ 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
-	rm -f $@.so
+# This branch is taken by lld, which auto detects the file format and does not
+# need OUTPUT_FORMAT.
+	echo > $@.new
 endif
 	mv -f $@.new $@
 common-generated += format.lds
diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
index 2f4ef195bb..43eb9efb40 100644
--- a/benchtests/strcoll-inputs/filelist#en_US.UTF-8
+++ b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
@@ -9450,7 +9450,6 @@ move-if-change
 check-execstack.awk
 pylint
 pylintrc
-output-format.sed
 merge-test-results.sh
 update-copyrights
 config-uname.sh
diff --git a/scripts/output-format.sed b/scripts/output-format.sed
deleted file mode 100644
index 364f52059f..0000000000
--- a/scripts/output-format.sed
+++ /dev/null
@@ -1,35 +0,0 @@
-/ld.*[ 	]-E[BL]/b f
-/collect.*[ 	]-E[BL]/b f
-/OUTPUT_FORMAT[^)]*$/{N
-s/\n[	 ]*/ /
-}
-t o
-: o
-s/^.*OUTPUT_FORMAT(\([^,]*\), \1, \1).*$/OUTPUT_FORMAT(\1)/
-t q
-s/^.*OUTPUT_FORMAT(\([^,]*\), \([^,]*\), \([^,]*\)).*$/\1,\2,\3/
-t s
-s/^.*OUTPUT_FORMAT(\([^,)]*\).*$)/OUTPUT_FORMAT(\1)/
-t q
-d
-: s
-s/"//g
-G
-s/\n//
-s/^\([^,]*\),\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\2)/p
-s/^\([^,]*\),\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\3)/p
-s/^\([^,]*\),\([^,]*\),\([^,]*\)/OUTPUT_FORMAT(\1)/p
-/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p
-q
-: q
-s/"//g
-p
-q
-: f
-s/^.*[ 	]-E\([BL]\)[ 	].*$/,\1/
-t h
-s/^.*[ 	]-E\([BL]\)$/,\1/
-t h
-d
-: h
-h