about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2020-07-29 16:28:57 +0930
committerCarlos O'Donell <carlos@redhat.com>2020-08-04 19:52:56 -0400
commitbd7a8e038ac01fc61f0fe58b57ae52ccb85a562f (patch)
tree8f19bec94fb408b81e03a104efe8f6120eb052f1
parent50a8dd367e305bb6c6146c564fd48c193cc94069 (diff)
downloadglibc-bd7a8e038ac01fc61f0fe58b57ae52ccb85a562f.tar.gz
glibc-bd7a8e038ac01fc61f0fe58b57ae52ccb85a562f.tar.xz
glibc-bd7a8e038ac01fc61f0fe58b57ae52ccb85a562f.zip
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>
-rw-r--r--Makerules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makerules b/Makerules
index 341db86c7e..ef0fe67d9a 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