From 6d72d289c4718c72f36880876d7460d6da4fa21a Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Fri, 22 Jun 2018 13:40:47 -0400
Subject: [PATCH] Fix "info registers" regexes in gdb.base/jit-reader.exp

Commit

  e813d34 ("Align natural-format register values to the same column")

changed the output of "info registers" (tabs to spaces), but didn't
update gdb.base/jit-reader.exp.  Update the regexes to expect spaces
instead.

gdb/testsuite/ChangeLog:

	* gdb.base/jit-reader.exp (jit_reader_test): Expect spaces in
	"info registers" output.
---
 gdb/testsuite/ChangeLog               |  5 ++++
 gdb/testsuite/gdb.base/jit-reader.exp | 54 +++++++++++++++++------------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 01f5792..73f5545 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-22  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* gdb.base/jit-reader.exp (jit_reader_test): Expect spaces in
+	"info registers" output.
+
 2018-06-21  Richard Bunt  <richard.bunt@arm.com>
 
 	* gdb.base/watchpoint-hw-attach.c: New test.
diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp
index 7a1e287..2ed7410 100644
--- a/gdb/testsuite/gdb.base/jit-reader.exp
+++ b/gdb/testsuite/gdb.base/jit-reader.exp
@@ -67,30 +67,30 @@ proc info_registers_current_frame {sp} {
 
     gdb_test "info registers" \
 	[multi_line \
-	     "rax            $hex	$decimal" \
-	     "rbx            $hex	$decimal" \
-	     "rcx            $hex	$decimal" \
-	     "rdx            $hex	$decimal" \
-	     "rsi            $hex	$decimal" \
-	     "rdi            $hex	$decimal" \
-	     "rbp            $hex	$hex" \
-	     "rsp            $sp	$sp" \
-	     "r8             $hex	$decimal" \
-	     "r9             $hex	$decimal" \
-	     "r10            $hex	$decimal" \
-	     "r11            $hex	$decimal" \
-	     "r12            $hex	$decimal" \
-	     "r13            $hex	$decimal" \
-	     "r14            $hex	$decimal" \
-	     "r15            $hex	$decimal" \
-	     "rip            $hex	$hex$any" \
-	     "eflags         $hex	\\\[$any\\\]" \
-	     "cs             $hex	$decimal" \
-	     "ss             $hex	$decimal" \
-	     "ds             $hex	$decimal" \
-	     "es             $hex	$decimal" \
-	     "fs             $hex	$decimal" \
-	     "gs             $hex	$decimal" \
+	     "rax            $hex +$decimal" \
+	     "rbx            $hex +$decimal" \
+	     "rcx            $hex +$decimal" \
+	     "rdx            $hex +$decimal" \
+	     "rsi            $hex +$decimal" \
+	     "rdi            $hex +$decimal" \
+	     "rbp            $hex +$hex" \
+	     "rsp            $sp +$sp" \
+	     "r8             $hex +$decimal" \
+	     "r9             $hex +$decimal" \
+	     "r10            $hex +$decimal" \
+	     "r11            $hex +$decimal" \
+	     "r12            $hex +$decimal" \
+	     "r13            $hex +$decimal" \
+	     "r14            $hex +$decimal" \
+	     "r15            $hex +$decimal" \
+	     "rip            $hex +$hex$any" \
+	     "eflags         $hex +\\\[$any\\\]" \
+	     "cs             $hex +$decimal" \
+	     "ss             $hex +$decimal" \
+	     "ds             $hex +$decimal" \
+	     "es             $hex +$decimal" \
+	     "fs             $hex +$decimal" \
+	     "gs             $hex +$decimal" \
 	    ]
 }
 
@@ -177,8 +177,8 @@ proc jit_reader_test {} {
 			 "rdx            <not saved>" \
 			 "rsi            <not saved>" \
 			 "rdi            <not saved>" \
-			 "rbp            $hex	$hex" \
-			 "rsp            $caller_sp	$caller_sp" \
+			 "rbp            $hex +$hex" \
+			 "rsp            $caller_sp +$caller_sp" \
 			 "r8             <not saved>" \
 			 "r9             <not saved>" \
 			 "r10            <not saved>" \
@@ -187,7 +187,7 @@ proc jit_reader_test {} {
 			 "r13            <not saved>" \
 			 "r14            <not saved>" \
 			 "r15            <not saved>" \
-			 "rip            $hex	$hex $any" \
+			 "rip            $hex +$hex $any" \
 			 "eflags         <not saved>" \
 			 "cs             <not saved>" \
 			 "ss             <not saved>" \
-- 
2.7.4