Skip to content

Commit

Permalink
undo CL 156430044 / 5d69cad4faaf
Browse files Browse the repository at this point in the history
Partial undo, changes to ldelf.c retained.

Some platforms are still not working even with the integrated assembler disabled, will have to find another solution.

««« original CL description
cmd/cgo: disable clang's integrated assembler

Fixes golang#8348.

Clang's internal assembler (introduced by default in clang 3.4) understands the .arch directive, but doesn't change the default value of -march. This causes the build to fail when we use BLX (armv5 and above) when clang is compiled for the default armv4t architecture (which appears to be the default on all the distros I've used).

This is probably a clang bug, so work around it for the time being by disabling the integrated assembler when compiling the cgo assembly shim.

This CL also includes a small change to ldelf.c which was required as clang 3.4 and above generate more weird symtab entries.

LGTM=iant
R=golang-codereviews, iant
CC=golang-codereviews
https://golang.org/cl/156430044
»»»

LGTM=minux
R=iant, minux
CC=golang-codereviews
https://golang.org/cl/162880044
  • Loading branch information
davecheney authored and wheatman committed Jul 9, 2018
1 parent 61e408e commit abe8301
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/cmd/cgo/gcc.go
Original file line number Diff line number Diff line change
Expand Up @@ -745,13 +745,7 @@ func (p *Package) gccMachine() []string {
case "386":
return []string{"-m32"}
case "arm":
args := []string{"-marm"} // not thumb
if strings.Contains(p.gccBaseCmd()[0], "clang") {
// The clang integrated assembler understands the .arch directive
// but does not appear to honor it, so disable it. Issue 8348.
args = append(args, "-no-integrated-as")
}
return args
return []string{"-marm"} // not thumb
}
return nil
}
Expand Down

0 comments on commit abe8301

Please sign in to comment.