From: Alan Modra <amodra@gmail.com>
Date: Wed, 29 Jul 2020 06:58:57 +0000 (+0930)
Subject: Don't mix linker error messages into edited scripts
X-Git-Tag: glibc-2.32~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd7a8e038ac01fc61f0fe58b57ae52ccb85a562f;p=thirdparty%2Fglibc.git

Don't mix linker error messages into edited scripts

	* Makerules (shlib.lds): Discard linker warning output.
	(format.lds): Likewise.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/Makerules b/Makerules
index 341db86c7ef..ef0fe67d9a9 100644
--- a/Makerules
+++ b/Makerules
@@ -557,7 +557,7 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
 	$(LINK.o) -shared -Wl,-O1 \
 		  -nostdlib -nostartfiles \
 		  $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS.so) \
-		  -Wl,--verbose 2>&1 | \
+		  -Wl,--verbose 2>/dev/null | \
 	  sed > $@T \
 	      -e '/^=========/,/^=========/!d;/^=========/d' \
 	      $(if $(filter yes,$(have-hash-style)), \
@@ -1073,7 +1073,7 @@ ifneq (unknown,$(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>&1 \
+		  -x c /dev/null -o $@.so -Wl,--verbose -v 2>/dev/null \
 	| sed -n -f $< > $@.new
 	test -s $@.new
 	rm -f $@.so