Skip to content

Commit b9ef800

Browse files
committed
cmd/cgo: use --no-gc-sections if available
zig cc passes `--gc-sections` to the underlying linker, which then causes undefined symbol errors when compiling with cgo but without C code. Add `-Wl,--no-gc-sections` to make it work with zig cc. Minimal example: **main.go** package main import _ "runtime/cgo" func main() {} Run (works after the patch, doesn't work before): CC="zig cc" go build main.go Among the existing code, `src/runtime/testdata/testprognet` fails to build: src/runtime/testdata/testprognet$ CC="zig cc" go build . net(.text): relocation target __errno_location not defined net(.text): relocation target getaddrinfo not defined net(.text): relocation target freeaddrinfo not defined net(.text): relocation target gai_strerror not defined runtime/cgo(.text): relocation target stderr not defined runtime/cgo(.text): relocation target fwrite not defined runtime/cgo(.text): relocation target vfprintf not defined runtime/cgo(.text): relocation target fputc not defined runtime/cgo(.text): relocation target abort not defined runtime/cgo(.text): relocation target pthread_create not defined runtime/cgo(.text): relocation target nanosleep not defined runtime/cgo(.text): relocation target pthread_detach not defined runtime/cgo(.text): relocation target stderr not defined runtime/cgo(.text): relocation target strerror not defined runtime/cgo(.text): relocation target fprintf not defined runtime/cgo(.text): relocation target abort not defined runtime/cgo(.text): relocation target pthread_mutex_lock not defined runtime/cgo(.text): relocation target pthread_cond_wait not defined runtime/cgo(.text): relocation target pthread_mutex_unlock not defined runtime/cgo(.text): relocation target pthread_cond_broadcast not defined runtime/cgo(.text): relocation target malloc not defined With the patch both examples build as expected. @ianlancetaylor suggested: > It would be fine with me if somebody wants to send a cgo patch that passes -Wl,--no-gc-sections, with a fallback if that option is not supported. ... and this is what we are doing. Tested with zig 0.10.0-dev.2252+a4369918b This is a continuation of CL 405414: the original one broke AIX and iOS builds. To fix that, added `unknown option` to the list of strings under lookup. Fixes #52690
1 parent 0a1a092 commit b9ef800

File tree

1 file changed

+27
-8
lines changed

1 file changed

+27
-8
lines changed

src/cmd/go/internal/work/exec.go

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2528,6 +2528,13 @@ func (b *Builder) compilerCmd(compiler []string, incdir, workdir string) []strin
25282528
a = append(a, "-Qunused-arguments")
25292529
}
25302530

2531+
// zig cc passes --gc-sections to the underlying linker, which then causes
2532+
// undefined symbol errors when compiling with cgo but without C code.
2533+
// https://github.com/golang/go/issues/52690
2534+
if b.gccSupportsFlag(compiler, "-Wl,--no-gc-sections") {
2535+
a = append(a, "-Wl,--no-gc-sections")
2536+
}
2537+
25312538
// disable word wrapping in error messages
25322539
a = append(a, "-fmessage-length=0")
25332540

@@ -2594,13 +2601,21 @@ func (b *Builder) gccSupportsFlag(compiler []string, flag string) bool {
25942601
defer os.Remove(tmp)
25952602
}
25962603

2597-
// We used to write an empty C file, but that gets complicated with
2598-
// go build -n. We tried using a file that does not exist, but that
2599-
// fails on systems with GCC version 4.2.1; that is the last GPLv2
2600-
// version of GCC, so some systems have frozen on it.
2601-
// Now we pass an empty file on stdin, which should work at least for
2602-
// GCC and clang.
2603-
cmdArgs := str.StringList(compiler, flag, "-c", "-x", "c", "-", "-o", tmp)
2604+
// We used to write an empty C file, but that gets complicated with go
2605+
// build -n. We tried using a file that does not exist, but that fails on
2606+
// systems with GCC version 4.2.1; that is the last GPLv2 version of GCC,
2607+
// so some systems have frozen on it. Now we pass an empty file on stdin,
2608+
// which should work at least for GCC and clang.
2609+
//
2610+
// If the argument is "-Wl,", then it's testing the linker. In that case,
2611+
// skip "-c". If it's not "-Wl,", then we are testing the compiler and
2612+
// can emit the linking step with "-c".
2613+
cmdArgs := str.StringList(compiler, flag)
2614+
if !strings.HasPrefix(flag, "-Wl,") /* linker flag */ {
2615+
cmdArgs = append(cmdArgs, "-c")
2616+
}
2617+
cmdArgs = append(cmdArgs, "-x", "c", "-", "-o", tmp)
2618+
26042619
if cfg.BuildN || cfg.BuildX {
26052620
b.Showcmd(b.WorkDir, "%s || true", joinUnambiguously(cmdArgs))
26062621
if cfg.BuildN {
@@ -2613,12 +2628,16 @@ func (b *Builder) gccSupportsFlag(compiler []string, flag string) bool {
26132628
out, _ := cmd.CombinedOutput()
26142629
// GCC says "unrecognized command line option".
26152630
// clang says "unknown argument".
2631+
// tcc says "unsupported"
2632+
// AIX and/or iOS say "not recognized"
26162633
// Older versions of GCC say "unrecognised debug output level".
26172634
// For -fsplit-stack GCC says "'-fsplit-stack' is not supported".
26182635
supported := !bytes.Contains(out, []byte("unrecognized")) &&
26192636
!bytes.Contains(out, []byte("unknown")) &&
26202637
!bytes.Contains(out, []byte("unrecognised")) &&
2621-
!bytes.Contains(out, []byte("is not supported"))
2638+
!bytes.Contains(out, []byte("is not supported")) &&
2639+
!bytes.Contains(out, []byte("not recognized")) &&
2640+
!bytes.Contains(out, []byte("unsupported"))
26222641
b.flagCache[key] = supported
26232642
return supported
26242643
}

0 commit comments

Comments
 (0)