From: Meng Zhuo Date: Wed, 18 Dec 2019 14:41:10 +0000 (+0800) Subject: cmd/go: accept hash-style in LDFLAGS X-Git-Tag: go1.15beta1~211 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5d9549debb313269a7adabdb271f3d67113fef1a;p=gostls13.git cmd/go: accept hash-style in LDFLAGS Change-Id: I493bb7e5e9a9e1752236dea1e032b317da7f67f1 Reviewed-on: https://go-review.googlesource.com/c/go/+/211560 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot --- diff --git a/src/cmd/go/internal/work/security.go b/src/cmd/go/internal/work/security.go index 2097cd46ff..b5e4d46f34 100644 --- a/src/cmd/go/internal/work/security.go +++ b/src/cmd/go/internal/work/security.go @@ -186,6 +186,7 @@ var validLinkerFlags = []*lazyregexp.Regexp{ re(`-Wl,--(no-)?export-dynamic`), re(`-Wl,-E`), re(`-Wl,-framework,[^,@\-][^,]+`), + re(`-Wl,--hash-style=(sysv|gnu|both)`), re(`-Wl,-headerpad_max_install_names`), re(`-Wl,--no-undefined`), re(`-Wl,-R([^@\-][^,@]*$)`), diff --git a/src/cmd/go/internal/work/security_test.go b/src/cmd/go/internal/work/security_test.go index 6b85c40b13..11e74f29c6 100644 --- a/src/cmd/go/internal/work/security_test.go +++ b/src/cmd/go/internal/work/security_test.go @@ -131,6 +131,7 @@ var goodLinkerFlags = [][]string{ {"-mtune=happybirthday"}, {"-pic"}, {"-pthread"}, + {"-Wl,--hash-style=both"}, {"-Wl,-rpath,foo"}, {"-Wl,-rpath,$ORIGIN/foo"}, {"-Wl,-R", "/foo"}, @@ -208,6 +209,7 @@ var badLinkerFlags = [][]string{ {"-Wl,-framework", "-Wl,@Home"}, {"-Wl,-framework", "@Home"}, {"-Wl,-framework,Chocolate,@Home"}, + {"-Wl,--hash-style=foo"}, {"-x", "--c"}, {"-x", "@obj"}, {"-Wl,-rpath,@foo"},