diff options
| author | Tianon Gravi <admwiggin@gmail.com> | 2015-01-15 11:54:00 -0700 |
|---|---|---|
| committer | Tianon Gravi <admwiggin@gmail.com> | 2015-01-15 11:54:00 -0700 |
| commit | f154da9e12608589e8d5f0508f908a0c3e88a1bb (patch) | |
| tree | f8255d51e10c6f1e0ed69702200b966c9556a431 /src/cmd/ld/elf.c | |
| parent | 8d8329ed5dfb9622c82a9fbec6fd99a580f9c9f6 (diff) | |
| download | golang-upstream/1.4.tar.gz | |
Imported Upstream version 1.4upstream/1.4
Diffstat (limited to 'src/cmd/ld/elf.c')
| -rw-r--r-- | src/cmd/ld/elf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/ld/elf.c b/src/cmd/ld/elf.c index 0555cf46a..3196961f3 100644 --- a/src/cmd/ld/elf.c +++ b/src/cmd/ld/elf.c @@ -776,7 +776,8 @@ elfshbits(Section *sect) if(sect->rwx & 2) sh->flags |= SHF_WRITE; if(strcmp(sect->name, ".tbss") == 0) { - sh->flags |= SHF_TLS; + if(strcmp(goos, "android") != 0) + sh->flags |= SHF_TLS; // no TLS on android sh->type = SHT_NOBITS; } if(linkmode != LinkExternal) |