From 324b293878613574a1c0ab8d87f238ad15a67387 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 28 Oct 2014 23:25:55 -0400
Subject: [PATCH] cmd/objdump: disassemble local text symbols

Fixes #8803.

LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/169720043
---
 src/cmd/objdump/main.go         |  2 +-
 src/cmd/objdump/objdump_test.go | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/cmd/objdump/main.go b/src/cmd/objdump/main.go
index aafc501110a..0f66f20a400 100644
--- a/src/cmd/objdump/main.go
+++ b/src/cmd/objdump/main.go
@@ -159,7 +159,7 @@ func dump(tab *gosym.Table, lookup lookupFunc, disasm disasmFunc, goarch string,
 
 	printed := false
 	for _, sym := range syms {
-		if sym.Code != 'T' || sym.Size == 0 || sym.Name == "_text" || sym.Name == "text" || sym.Addr < textStart || symRE != nil && !symRE.MatchString(sym.Name) {
+		if (sym.Code != 'T' && sym.Code != 't') || sym.Size == 0 || sym.Name == "_text" || sym.Name == "text" || sym.Addr < textStart || symRE != nil && !symRE.MatchString(sym.Name) {
 			continue
 		}
 		if sym.Addr >= textStart+uint64(len(textData)) || sym.Addr+uint64(sym.Size) > textStart+uint64(len(textData)) {
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go
index 54108562621..a9eeea1e066 100644
--- a/src/cmd/objdump/objdump_test.go
+++ b/src/cmd/objdump/objdump_test.go
@@ -157,12 +157,15 @@ var armNeed = []string{
 // binary for the current system (only) and test that objdump
 // can handle that one.
 
-func TestDisasm(t *testing.T) {
+func testDisasm(t *testing.T, flags ...string) {
 	tmp, exe := buildObjdump(t)
 	defer os.RemoveAll(tmp)
 
 	hello := filepath.Join(tmp, "hello.exe")
-	out, err := exec.Command("go", "build", "-o", hello, "testdata/fmthello.go").CombinedOutput()
+	args := []string{"build", "-o", hello}
+	args = append(args, flags...)
+	args = append(args, "testdata/fmthello.go")
+	out, err := exec.Command("go", args...).CombinedOutput()
 	if err != nil {
 		t.Fatalf("go build fmthello.go: %v\n%s", err, out)
 	}
@@ -194,3 +197,15 @@ func TestDisasm(t *testing.T) {
 		t.Logf("full disassembly:\n%s", text)
 	}
 }
+
+func TestDisasm(t *testing.T) {
+	testDisasm(t)
+}
+
+func TestDisasmExtld(t *testing.T) {
+	switch runtime.GOOS {
+	case "windows":
+		t.Skipf("skipping on %s", runtime.GOOS)
+	}
+	testDisasm(t, "-ldflags=-linkmode=external")
+}