From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <carlos@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2191)
 id 78ABB3857C71; Tue,  4 Aug 2020 23:53:30 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 78ABB3857C71
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Carlos O'Donell <carlos@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Don't mix linker error messages into edited scripts
X-Act-Checkin: glibc
X-Git-Author: Alan Modra <amodra@gmail.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 50a8dd367e305bb6c6146c564fd48c193cc94069
X-Git-Newrev: bd7a8e038ac01fc61f0fe58b57ae52ccb85a562f
Message-Id: <20200804235330.78ABB3857C71@sourceware.org>
Date: Tue,  4 Aug 2020 23:53:30 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Aug 2020 23:53:30 -0000

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

commit bd7a8e038ac01fc61f0fe58b57ae52ccb85a562f
Author: Alan Modra <amodra@gmail.com>
Date:   Wed Jul 29 16:28:57 2020 +0930

    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:
---
 Makerules | 4 ++--
 1 file 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