diff options
| author | Michael Munday <munday@ca.ibm.com> | 2016-03-21 13:30:50 -0400 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-04-12 15:41:21 +0000 |
| commit | 921b2eba52906fc8b9bc4a8744dab63678f5ed3a (patch) | |
| tree | d8de645a34799c3c62b93abf85e113dc646d2ac9 /src/debug | |
| parent | 7cbe7b1e867db9001db35ca41ee3e4a3b0de31c7 (diff) | |
| download | go-git-921b2eba52906fc8b9bc4a8744dab63678f5ed3a.tar.gz | |
debug/gosym: accept PC quantum of 2 (for s390x)
Needed for the header check to accept the header generated for
s390x as Go 1.2 style rather than Go 1.1 style.
Change-Id: I7b3713d4cc7514cfc58f947a45702348f6d7b824
Reviewed-on: https://go-review.googlesource.com/20966
Reviewed-by: Minux Ma <minux@golang.org>
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/gosym/pclntab.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/debug/gosym/pclntab.go b/src/debug/gosym/pclntab.go index 01a9f11f05..291f102262 100644 --- a/src/debug/gosym/pclntab.go +++ b/src/debug/gosym/pclntab.go @@ -167,7 +167,7 @@ func (t *LineTable) go12Init() { // Check header: 4-byte magic, two zeros, pc quantum, pointer size. t.go12 = -1 // not Go 1.2 until proven otherwise if len(t.Data) < 16 || t.Data[4] != 0 || t.Data[5] != 0 || - (t.Data[6] != 1 && t.Data[6] != 4) || // pc quantum + (t.Data[6] != 1 && t.Data[6] != 2 && t.Data[6] != 4) || // pc quantum (t.Data[7] != 4 && t.Data[7] != 8) { // pointer size return } |