From: Michael Munday <munday@ca.ibm.com>
Date: Fri, 18 Mar 2016 20:49:19 +0000 (-0400)
Subject: cmd/internal/objfile: add s390x support
X-Git-Tag: go1.7beta1~1193
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=992320aaa8e30fdd006b5c781b58549a2327d3b6;p=gostls13.git

cmd/internal/objfile: add s390x support

Change-Id: I39aa6569c9a6f327f7aaa01f8b4ace814fd5b766
Reviewed-on: https://go-review.googlesource.com/20943
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/internal/objfile/disasm.go b/src/cmd/internal/objfile/disasm.go
index b2e7485a9d..d63f8f616f 100644
--- a/src/cmd/internal/objfile/disasm.go
+++ b/src/cmd/internal/objfile/disasm.go
@@ -245,4 +245,5 @@ var byteOrders = map[string]binary.ByteOrder{
 	"arm":     binary.LittleEndian,
 	"ppc64":   binary.BigEndian,
 	"ppc64le": binary.LittleEndian,
+	"s390x":   binary.BigEndian,
 }
diff --git a/src/cmd/internal/objfile/elf.go b/src/cmd/internal/objfile/elf.go
index 7ddfe1df24..6369f7e259 100644
--- a/src/cmd/internal/objfile/elf.go
+++ b/src/cmd/internal/objfile/elf.go
@@ -99,6 +99,8 @@ func (f *elfFile) goarch() string {
 		return "arm"
 	case elf.EM_PPC64:
 		return "ppc64"
+	case elf.EM_S390:
+		return "s390x"
 	}
 	return ""
 }