Merge GDB 7.5.1

gdb/testsuite/gdb.cp/cp-relocate.exp

 # Copyright 2007-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 # Test loading symbols from unrelocated C++ object files.
 
-set testfile cp-relocate
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}.o
+standard_testfile .cc
+append binfile .o
 
 if { [skip_cplus_tests] } { continue }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {c++ debug}] != "" } {
      untested cp-relocate.exp
      return -1
 }
 
 proc get_func_address { func } {
     global gdb_prompt hex
 
     set rfunc [string_to_regexp $func]
     gdb_test_multiple "print ${func}" "get address of ${func}" {
-        -re "\\\$\[0-9\]+ = \\{.*\\} (0|($hex) <${rfunc}>)\[\r\n\]+${gdb_prompt} $" {
+        -re "\\\$\[0-9\]+ = \\{.*\\} (($hex) <${rfunc}.*>)\[\r\n\]+${gdb_prompt} $" {
             # $1 = {int ()} 0x24 <function_bar>
             # But if the function is at zero, the name may be omitted.
             pass "get address of ${func}"
-            if { $expect_out(1,string) == "0" } {
+            if { $expect_out(1,string) == "0x0" } {
                 return "0x0"
             } else {
                 return $expect_out(2,string)
             }
         }
     }
   return ""
 }
 
 # Load the file as an executable; GDB should assign non-overlapping
@@ skipping 78 matching lines @@
         "Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
         "add-symbol-file ${testfile}.o" \
         "add symbol table from file \".*${testfile}\\.o\" at.*\\(y or n\\) " \
         "y"
 
 # Make sure the function addresses were updated.
 gdb_test "break *$func1_name" \
     "Breakpoint $decimal at 0x1....: file .*"
 gdb_test "break *$func2_name" \
     "Breakpoint $decimal at 0x2....: file .*"