Skip to content

Commit 5c8a81c

Browse files
committed
cmd/go: Remove -Wl,-z,relro,-z,now test case
Signed-off-by: Morten Linderud <[email protected]>
1 parent 20ab0e5 commit 5c8a81c

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/cmd/go/internal/work/security.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ var validLinkerFlags = []*lazyregexp.Regexp{
206206
re(`-Wl,--(no-)?warn-([^,]+)`),
207207
re(`-Wl,-?-wrap[=,][^,@\-][^,]*`),
208208
re(`-Wl,-z,(no)?execstack`),
209-
re(`-Wl,-z,relro(,-z,now)?`),
209+
re(`-Wl,-z,relro`),
210210

211211
re(`[a-zA-Z0-9_/].*\.(a|o|obj|dll|dylib|so)`), // direct linker inputs: x.o or libfoo.so (but not -foo.o or @foo.o)
212212
re(`\./.*\.(a|o|obj|dll|dylib|so)`),

src/cmd/go/internal/work/security_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ var goodLinkerFlags = [][]string{
149149
{"-Wl,--just-symbols,foo"},
150150
{"-Wl,--warn-error"},
151151
{"-Wl,--no-warn-error"},
152-
{"-Wl,-z,relro"},
153-
{"-Wl,-z,relro,-z,now"},
154152
{"foo.so"},
155153
{"_世界.dll"},
156154
{"./x.o"},
@@ -226,7 +224,6 @@ var badLinkerFlags = [][]string{
226224
{"-Wl,-R,foo,bar"},
227225
{"-Wl,-R,@foo"},
228226
{"-Wl,--just-symbols,@foo"},
229-
{"-Wl,-z,relro,-z,nottoday"},
230227
{"../x.o"},
231228
}
232229

0 commit comments

Comments
 (0)