From 52781cce795439ce5055ee9b8a8c7bc6f92b7b72 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 15 Jul 2020 11:17:41 +0200 Subject: [PATCH] [gdb/testsuite] Handle callq -> call disassembly change We're currently running into: ... FAIL: gdb.trace/entry-values.exp: disassemble bar ... Since commit 36938cabf0 "x86: avoid attaching suffixes to unambiguous insns", "callq" is disassembled as "call", and the test-case expects "callq". Fix this by expecting "call" instead. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-07-15 Tom de Vries * gdb.trace/entry-values.exp: Expect "call" instead of "callq" if is_amd64_regs_target. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/entry-values.exp | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e24b066fb15..d056485e5a7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-07-15 Tom de Vries + + * gdb.trace/entry-values.exp: Expect "call" instead of "callq" if + is_amd64_regs_target. + 2020-07-15 Andrew Burgess * gdb.fortran/ptype-on-functions.exp: Add more tests. diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp index 8822950826a..f647f3ca096 100644 --- a/gdb/testsuite/gdb.trace/entry-values.exp +++ b/gdb/testsuite/gdb.trace/entry-values.exp @@ -62,8 +62,6 @@ if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } { # returns. The only exception is JALRC, in which case execution # resumes from `insn1' instead. set call_insn {jalrc|[jb]al[sxr]*[ \t][^\r\n]+\r\n} -} elseif [is_amd64_regs_target] { - set call_insn "callq" } else { set call_insn "call" } -- 2.30.2