From f154da9e12608589e8d5f0508f908a0c3e88a1bb Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Thu, 15 Jan 2015 11:54:00 -0700
Subject: Imported Upstream version 1.4

---
 src/cmd/ld/elf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/cmd/ld/elf.c')

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)
-- 
cgit v1.2.3