Merge GDB 7.5.1

gdb/testsuite/gdb.base/solib-overlap.exp

 # Copyright 2009-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.
@@ skipping 18 matching lines @@
 
 if [skip_shlib_tests] {
     return 0
 }
 
 # Are we on a target board?  It is required for attaching to a process.
 if [is_remote target] {
     return 0
 }
 
-if [get_compiler_info binfile-unused] {
+if [get_compiler_info] {
     return -1;
 }
 
 # Library file.
 set libname "solib-overlap-lib"
 set srcfile_lib ${srcdir}/${subdir}/${libname}.c
 # Binary file.
 set testfile "solib-overlap-main"
 set srcfile ${srcdir}/${subdir}/${testfile}.c
 
 # Base addresses for `prelink -r' which should be compatible with both -m32 and
 # -m64 targets.  If it clashes with system prelinked libraries it would give
 # false PASS.
 # Prelink first lib1 at 0x40000000 and lib2 at 0x41000000.
 # During second pass try lib1 at 0x50000000 and lib2 at 0x51000000.
-foreach prelink_lib1 {0x40000000 0x50000000} {
+foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1" {
     set prelink_lib2 [format "0x%x" [expr $prelink_lib1 + 0x01000000]]
 
-    set old_prefix $pf_prefix
-    lappend pf_prefix "$prelink_lib1:"
-
     # Library file.
     set binfile_lib1 ${objdir}/${subdir}/${libname}1-${prelink_lib1}.so
     set binfile_lib1_test_msg OBJDIR/${subdir}/${libname}1-${prelink_lib1}.so
     set binfile_lib2 ${objdir}/${subdir}/${libname}2-${prelink_lib1}.so
     set binfile_lib2_test_msg OBJDIR/${subdir}/${libname}2-${prelink_lib1}.so
     set lib_flags {debug}
     # Binary file.
     set binfile_base ${testfile}-${prelink_lib1}
     set binfile ${objdir}/${subdir}/${binfile_base}
     set binfile_test_msg OBJDIR/${subdir}/${binfile_base}
@@ skipping 59 matching lines @@
 
     # Detach the process.
 
     gdb_test "detach" "Detaching from program: .*$escapedbinfile, process $testpid"
 
     # Wait a bit for gdb to finish detaching
 
     sleep 5
 
     remote_exec build "kill -9 ${testpid}"
-
-    set pf_prefix $old_prefix
-}
+}}