From: Russ Cox <rsc@golang.org>
Date: Thu, 29 Jan 2015 03:39:57 +0000 (-0500)
Subject: liblink: fix error message on linux for unknown TLS base
X-Git-Tag: go1.5beta1~2211
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a99369fdb5137862cf12469afcd96a47852916b2;p=gostls13.git

liblink: fix error message on linux for unknown TLS base

headstr(Hlinux) was reporting "android",
making for some confusing error messages.

Change-Id: I437095bee7cb2143aa37c91cf786f3a3581ae7b9
Reviewed-on: https://go-review.googlesource.com/3513
Reviewed-by: Austin Clements <austin@google.com>
---

diff --git a/src/liblink/sym.c b/src/liblink/sym.c
index 35b88f44a2..079f600aa9 100644
--- a/src/liblink/sym.c
+++ b/src/liblink/sym.c
@@ -44,12 +44,12 @@ static struct {
 	char *name;
 	int val;
 } headers[] = {
-	{"android",	Hlinux},
 	{"darwin",	Hdarwin},
 	{"dragonfly",	Hdragonfly},
 	{"elf",		Helf},
 	{"freebsd",	Hfreebsd},
 	{"linux",	Hlinux},
+	{"android",	Hlinux}, // must be after "linux" entry or else headstr(Hlinux) == "android"
 	{"nacl",		Hnacl},
 	{"netbsd",	Hnetbsd},
 	{"openbsd",	Hopenbsd},