Merge GDB 7.5.1

gdb/testsuite/gdb.objc/basicclass.exp

Index: gdb/testsuite/gdb.objc/basicclass.exp
diff --git a/gdb/testsuite/gdb.objc/basicclass.exp b/gdb/testsuite/gdb.objc/basicclass.exp
index 18c373b8462e2f925ba68c8732a480c1bac31921..befe620df340c5deb52149f15ba92ea8e38156dc 100644
--- a/gdb/testsuite/gdb.objc/basicclass.exp
+++ b/gdb/testsuite/gdb.objc/basicclass.exp
@@ -15,13 +15,7 @@
 
 # This file was written by Adam Fedor (fedor@gnu.org)
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "basicclass"
-set srcfile ${testfile}.m
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .m
 
 #
 # Objective-C program compilation isn't standard. We need to figure out
@@ -77,7 +71,6 @@ proc deduce_language_of_main {} {
 
 proc do_objc_tests {} {
     global subdir
-    global objdir
     global srcdir
     global binfile
     global gdb_prompt
@@ -152,7 +145,7 @@ gdb_test "print self" \
     " print self"
 
 gdb_test "print \*self" \
-    "\\$\[0-9\] = \{{?isa = 0x\[0-9a-f\]+}?, object = 0x0\}" \
+    "\\$\[0-9\] = \{{?isa = 0x\[0-9a-f\]+( <.*>)?}?, object = 0x0\}" \
     " print contents of self"
 
 #