summaryrefslogtreecommitdiff
path: root/src/pkg/debug/gosym
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2011-01-17 12:40:45 +0100
committerOndřej Surý <ondrej@sury.org>2011-01-17 12:40:45 +0100
commit3e45412327a2654a77944249962b3652e6142299 (patch)
treebc3bf69452afa055423cbe0c5cfa8ca357df6ccf /src/pkg/debug/gosym
parentc533680039762cacbc37db8dc7eed074c3e497be (diff)
downloadgolang-upstream/2011.01.12.tar.gz
Imported Upstream version 2011.01.12upstream/2011.01.12
Diffstat (limited to 'src/pkg/debug/gosym')
-rw-r--r--src/pkg/debug/gosym/Makefile2
-rw-r--r--src/pkg/debug/gosym/pclinetest.s35
-rw-r--r--src/pkg/debug/gosym/pclntab_test.go2
3 files changed, 4 insertions, 35 deletions
diff --git a/src/pkg/debug/gosym/Makefile b/src/pkg/debug/gosym/Makefile
index ac16b4cee..3c0d8c440 100644
--- a/src/pkg/debug/gosym/Makefile
+++ b/src/pkg/debug/gosym/Makefile
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include ../../../Make.$(GOARCH)
+include ../../../Make.inc
TARG=debug/gosym
GOFILES=\
diff --git a/src/pkg/debug/gosym/pclinetest.s b/src/pkg/debug/gosym/pclinetest.s
index 519656b63..6305435b0 100644
--- a/src/pkg/debug/gosym/pclinetest.s
+++ b/src/pkg/debug/gosym/pclinetest.s
@@ -51,39 +51,8 @@ TEXT main(SB),7,$0
CALL pcfromline(SB)
// Keep the linker happy
-TEXT runtime·morestack(SB),7,$0
+TEXT main·main(SB),7,$0
RET
-TEXT runtime·morestack00(SB),7,$0
+TEXT main·init(SB),7,$0
RET
-
-TEXT runtime·morestack10(SB),7,$0
- RET
-
-TEXT runtime·morestack01(SB),7,$0
- RET
-
-TEXT runtime·morestack11(SB),7,$0
- RET
-
-TEXT runtime·morestack8(SB),7,$0
- RET
-
-TEXT runtime·morestack16(SB),7,$0
- RET
-
-TEXT runtime·morestack24(SB),7,$0
- RET
-
-TEXT runtime·morestack32(SB),7,$0
- RET
-
-TEXT runtime·morestack40(SB),7,$0
- RET
-
-TEXT runtime·morestack48(SB),7,$0
- RET
-
-TEXT runtime·morestack8(SB),7,$0
- RET
-
diff --git a/src/pkg/debug/gosym/pclntab_test.go b/src/pkg/debug/gosym/pclntab_test.go
index 8752e3c9f..908702173 100644
--- a/src/pkg/debug/gosym/pclntab_test.go
+++ b/src/pkg/debug/gosym/pclntab_test.go
@@ -143,7 +143,7 @@ func TestLineAline(t *testing.T) {
}
}
-// gotest: if [ "$(uname)-$(uname -m)" = Linux-x86_64 ]; then
+// gotest: if [ "$(uname)-$(uname -m)" = Linux-x86_64 -a "$GOARCH" = amd64 ]; then
// gotest: mkdir -p _test && $AS pclinetest.s && $LD -E main -o _test/pclinetest pclinetest.$O
// gotest: fi
func TestPCLine(t *testing.T) {