-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
universe/go: fix undefined __stack_chk_fail_local errors on x86
[ commit ea935baf6775d139ddc1d894259c745949b33605 ] See: golang/go#58385
- Loading branch information
1 parent
279f88c
commit b7110bd
Showing
4 changed files
with
165 additions
and
0 deletions.
There are no files selected for viewing
67 changes: 67 additions & 0 deletions
67
universe/go/0001-cmd-link-load-host-archive-libc_nonshared.a-for-fsta.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| From 066b780502c8c87c03f8a5e0bbc16c1c87221cf1 Mon Sep 17 00:00:00 2001 | ||
| From: Than McIntosh <[email protected]> | ||
| Date: Mon, 12 Dec 2022 11:04:05 -0500 | ||
| Subject: [PATCH] cmd/link: load host archive libc_nonshared.a for | ||
| -fstack-protector | ||
|
|
||
| For internal linking, at the point where we finish reading libgcc.a, | ||
| if the symbol "__stack_chk_local" is still undefined, then read | ||
| in the host archive libc_nonshared.a as well. | ||
|
|
||
| Updates #57261. | ||
|
|
||
| Change-Id: I0b1e485aa50aa7940db8cabcb3b9a7959bf99ce7 | ||
| Reviewed-on: https://go-review.googlesource.com/c/go/+/456856 | ||
| Reviewed-by: Cherry Mui <[email protected]> | ||
| Run-TryBot: Than McIntosh <[email protected]> | ||
| TryBot-Result: Gopher Robot <[email protected]> | ||
| --- | ||
| src/cmd/link/internal/ld/lib.go | 19 +++++++++++++++++++ | ||
| src/runtime/cgo/cgo.go | 4 +--- | ||
| 2 files changed, 20 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go | ||
| index 3b34e40358..17df56f4d5 100644 | ||
| --- a/src/cmd/link/internal/ld/lib.go | ||
| +++ b/src/cmd/link/internal/ld/lib.go | ||
| @@ -630,6 +630,25 @@ func (ctxt *Link) loadlib() { | ||
| } | ||
| if *flagLibGCC != "none" { | ||
| hostArchive(ctxt, *flagLibGCC) | ||
| + // For glibc systems, the linker setup used by GCC | ||
| + // looks like | ||
| + // | ||
| + // GROUP ( /lib/x86_64-linux-gnu/libc.so.6 | ||
| + // /usr/lib/x86_64-linux-gnu/libc_nonshared.a | ||
| + // AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) | ||
| + // | ||
| + // where libc_nonshared.a contains a small set of | ||
| + // symbols including "__stack_chk_fail_local" and a | ||
| + // few others. Thus if we are doing internal linking | ||
| + // and "__stack_chk_fail_local" is unresolved (most | ||
| + // likely due to the use of -fstack-protector), try | ||
| + // loading libc_nonshared.a to resolve it. | ||
| + isunresolved := symbolsAreUnresolved(ctxt, []string{"__stack_chk_fail_local"}) | ||
| + if isunresolved[0] { | ||
| + if p := ctxt.findLibPath("libc_nonshared.a"); p != "none" { | ||
| + hostArchive(ctxt, p) | ||
| + } | ||
| + } | ||
| } | ||
| } | ||
| } | ||
| diff --git a/src/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go | ||
| index b8473e532d..6d721bc8ff 100644 | ||
| --- a/src/runtime/cgo/cgo.go | ||
| +++ b/src/runtime/cgo/cgo.go | ||
| @@ -23,9 +23,7 @@ package cgo | ||
| #cgo solaris LDFLAGS: -lxnet | ||
| #cgo solaris LDFLAGS: -lsocket | ||
|
|
||
| -// We use -fno-stack-protector because internal linking won't find | ||
| -// the support functions. See issues #52919 and #54313. | ||
| -#cgo CFLAGS: -Wall -Werror -fno-stack-protector | ||
| +#cgo CFLAGS: -Wall -Werror | ||
|
|
||
| #cgo solaris CPPFLAGS: -D_POSIX_PTHREAD_SEMANTICS | ||
|
|
28 changes: 28 additions & 0 deletions
28
universe/go/0002-cmd-link-check-for-libssp_nonshared.a-instead-of-lib.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From ba7066a1311a9a232e422e6dd2b82f18a5758750 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <[email protected]> | ||
| Date: Tue, 7 Feb 2023 16:39:36 +0100 | ||
| Subject: [PATCH] cmd/link: check for libssp_nonshared.a instead of | ||
| libc_nonshared.a | ||
|
|
||
| See: https://github.com/golang/go/issues/58385 | ||
| --- | ||
| src/cmd/link/internal/ld/lib.go | 4 +++- | ||
| 1 file changed, 3 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go | ||
| index 17df56f4d5..f593dcd895 100644 | ||
| --- a/src/cmd/link/internal/ld/lib.go | ||
| +++ b/src/cmd/link/internal/ld/lib.go | ||
| @@ -643,9 +643,11 @@ func (ctxt *Link) loadlib() { | ||
| // and "__stack_chk_fail_local" is unresolved (most | ||
| // likely due to the use of -fstack-protector), try | ||
| // loading libc_nonshared.a to resolve it. | ||
| + // | ||
| + // On Alpine, the library is called libssp_nonshared.a. | ||
| isunresolved := symbolsAreUnresolved(ctxt, []string{"__stack_chk_fail_local"}) | ||
| if isunresolved[0] { | ||
| - if p := ctxt.findLibPath("libc_nonshared.a"); p != "none" { | ||
| + if p := ctxt.findLibPath("libssp_nonshared.a"); p != "none" { | ||
| hostArchive(ctxt, p) | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
universe/go/0003-cmd-link-always-check-for-__stack_chk_fail_local-ref.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| From 379e6fa10c844dfb210d3de361a14edf833074b2 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <[email protected]> | ||
| Date: Tue, 7 Feb 2023 08:17:03 +0100 | ||
| Subject: [PATCH] cmd/link: always check for __stack_chk_fail_local references | ||
|
|
||
| Otherwise, tests with `-libgcc none` fail on x86. | ||
|
|
||
| See: https://github.com/golang/go/issues/58385 | ||
| --- | ||
| src/cmd/link/internal/ld/lib.go | 40 ++++++++++++++++----------------- | ||
| 1 file changed, 20 insertions(+), 20 deletions(-) | ||
|
|
||
| diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go | ||
| index f593dcd895..d951e5f58a 100644 | ||
| --- a/src/cmd/link/internal/ld/lib.go | ||
| +++ b/src/cmd/link/internal/ld/lib.go | ||
| @@ -630,26 +630,26 @@ func (ctxt *Link) loadlib() { | ||
| } | ||
| if *flagLibGCC != "none" { | ||
| hostArchive(ctxt, *flagLibGCC) | ||
| - // For glibc systems, the linker setup used by GCC | ||
| - // looks like | ||
| - // | ||
| - // GROUP ( /lib/x86_64-linux-gnu/libc.so.6 | ||
| - // /usr/lib/x86_64-linux-gnu/libc_nonshared.a | ||
| - // AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) | ||
| - // | ||
| - // where libc_nonshared.a contains a small set of | ||
| - // symbols including "__stack_chk_fail_local" and a | ||
| - // few others. Thus if we are doing internal linking | ||
| - // and "__stack_chk_fail_local" is unresolved (most | ||
| - // likely due to the use of -fstack-protector), try | ||
| - // loading libc_nonshared.a to resolve it. | ||
| - // | ||
| - // On Alpine, the library is called libssp_nonshared.a. | ||
| - isunresolved := symbolsAreUnresolved(ctxt, []string{"__stack_chk_fail_local"}) | ||
| - if isunresolved[0] { | ||
| - if p := ctxt.findLibPath("libssp_nonshared.a"); p != "none" { | ||
| - hostArchive(ctxt, p) | ||
| - } | ||
| + } | ||
| + // For glibc systems, the linker setup used by GCC | ||
| + // looks like | ||
| + // | ||
| + // GROUP ( /lib/x86_64-linux-gnu/libc.so.6 | ||
| + // /usr/lib/x86_64-linux-gnu/libc_nonshared.a | ||
| + // AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) | ||
| + // | ||
| + // where libc_nonshared.a contains a small set of | ||
| + // symbols including "__stack_chk_fail_local" and a | ||
| + // few others. Thus if we are doing internal linking | ||
| + // and "__stack_chk_fail_local" is unresolved (most | ||
| + // likely due to the use of -fstack-protector), try | ||
| + // loading libc_nonshared.a to resolve it. | ||
| + // | ||
| + // On Alpine, the library is called libssp_nonshared.a. | ||
| + isunresolved := symbolsAreUnresolved(ctxt, []string{"__stack_chk_fail_local"}) | ||
| + if isunresolved[0] { | ||
| + if p := ctxt.findLibPath("libssp_nonshared.a"); p != "none" { | ||
| + hostArchive(ctxt, p) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters