From 565e70fcefd63c1f57989a0f794bf7c8bb4cf5ec Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 26 Mar 2021 11:00:40 +0100 Subject: [PATCH] cmd/link/internal/ld: use linkerFlagSupported to check -Qunused-arguments Rather than checking the linker name or its path for the string "clang", use linkerFlagSupported to determine whether the -Qunused-arguments flag may be passed to the linker. Fixes #45241 Change-Id: I4c1e4d4ecba4cf5823e8f39cfda5d20404ebf513 Reviewed-on: https://go-review.googlesource.com/c/go/+/304692 Trust: Tobias Klauser Run-TryBot: Tobias Klauser TryBot-Result: Go Bot Reviewed-by: Than McIntosh --- src/cmd/link/internal/ld/lib.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go index c80c29a6a8..85d0eedecf 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -1475,8 +1475,9 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-bE:"+fileName) } - if strings.Contains(argv[0], "clang") { - argv = append(argv, "-Qunused-arguments") + const unusedArguments = "-Qunused-arguments" + if linkerFlagSupported(ctxt.Arch, argv[0], altLinker, unusedArguments) { + argv = append(argv, unusedArguments) } const compressDWARF = "-Wl,--compress-debug-sections=zlib-gnu" -- 2.50.0