Merge GDB 7.5.1

gdb/testsuite/gdb.base/charset.exp

Index: gdb/testsuite/gdb.base/charset.exp
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 651633b4e47b1406e717b43eb61b77786796938c..27e36d6dd060910da42556a66d5438eb397e8718 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -20,10 +20,6 @@
 
 # Test GDB's character set support.
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 
 set testfile "charset"
 set srcfile ${testfile}.c
@@ -608,7 +604,7 @@ gdb_test "print 'a' == 'a' || 'b' == 'b'" \
 
 proc string_display { var_name set_prefix x_size x_type} {
   gdb_test_no_output "set ${var_name} = ${set_prefix}\"Test String\\0with zeroes\"" "Assign ${var_name} with prefix ${set_prefix}"
-  gdb_test "x /2${x_size}s ${var_name}" ".* ${x_type}\"Test String\"\[\r\n\]+.* ${x_type}\"with zeroes\"" "Display String ${var_name} with x/${x_size}s"
+  gdb_test "x /2${x_size}s ${var_name}" ".*\t${x_type}\"Test String\"\[\r\n\]+.*\t${x_type}\"with zeroes\"" "Display String ${var_name} with x/${x_size}s"
 }
 
 if {$ucs2_ok} {