Commit cf9558c8 authored by Dave Cheney's avatar Dave Cheney

cmd/cgo: disable clang's integrated assembler

Fixes #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
parent e5383c68
...@@ -745,7 +745,13 @@ func (p *Package) gccMachine() []string { ...@@ -745,7 +745,13 @@ func (p *Package) gccMachine() []string {
case "386": case "386":
return []string{"-m32"} return []string{"-m32"}
case "arm": case "arm":
return []string{"-marm"} // not thumb 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 nil return nil
} }
......
...@@ -819,7 +819,7 @@ readsym(ElfObj *obj, int i, ElfSym *sym, int needSym) ...@@ -819,7 +819,7 @@ readsym(ElfObj *obj, int i, ElfSym *sym, int needSym)
} }
break; break;
case ElfSymBindLocal: case ElfSymBindLocal:
if(!(thechar == '5' && (strcmp(sym->name, "$a") == 0 || strcmp(sym->name, "$d") == 0))) // binutils for arm generate these mapping symbols, ignore these if(!(thechar == '5' && (strncmp(sym->name, "$a", 2) == 0 || strncmp(sym->name, "$d", 2) == 0))) // binutils for arm generate these mapping symbols, ignore these
if(needSym) { if(needSym) {
// local names and hidden visiblity global names are unique // local names and hidden visiblity global names are unique
// and should only reference by its index, not name, so we // and should only reference by its index, not name, so we
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment