commit 2f238d981a3ee57cf7c223d1543b57ce7ce6c317
author Adam Langley <agl@google.com> Fri May 12 08:13:16 2017 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri May 12 20:33:40 2017 +0000
tree fff36918706e3242f5373e3e28e515a2a3d3b60e
parent 866c2194320c140991d31a0dc57a30c271772c91

Accept vmovq as an alias for movq.

Change-Id: I358b5da2463597e6b3d5841a4faa974c604e5df5
Reviewed-on: https://boringssl-review.googlesource.com/16284
Reviewed-by: Matt Braithwaite <mab@google.com>
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

util/fipstools/delocate.go

diff --git a/util/fipstools/delocate.go b/util/fipstools/delocate.go
index 34082c9..2bfe20d 100644
--- a/util/fipstools/delocate.go
+++ b/util/fipstools/delocate.go
@@ -309,7 +309,7 @@
 			ret = append(ret, line)
 			continue
 
-		case "leaq", "movq", "cmpq", "cmovneq", "cmoveq":
+		case "leaq", "vmovq", "movq", "cmpq", "cmovneq", "cmoveq":
 			if instr == "movq" && strings.Contains(line, "@GOTTPOFF(%rip)") {
 				// GOTTPOFF are offsets into the thread-local
 				// storage that are stored in the GOT. We have
@@ -342,7 +342,7 @@
 					line = strings.Replace(line, target, localTargetName(target), 1)
 				}
 
-				if strings.Contains(line, "@GOTPCREL") && (instr == "movq" || instr == "cmoveq" || instr == "cmovneq") {
+				if strings.Contains(line, "@GOTPCREL") && (instr == "movq" || instr == "vmovq" || instr == "cmoveq" || instr == "cmovneq") {
 					line = strings.Replace(line, "@GOTPCREL", "", -1)
 					target = strings.Replace(target, "@GOTPCREL", "", -1)
 
@@ -370,7 +370,7 @@
 
 					destination := args[1]
 					if strings.HasPrefix(destination, "%xmm") {
-						if instr != "movq" {
+						if instr != "movq" && instr != "vmovq" {
 							panic("unhandled: " + orig)
 						}