Merge GDB 7.5.1

gdb/testsuite/gdb.base/attach-pie-misread.exp

 # Copyright 2010-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/>.
 
 # This test only works on GNU/Linux.
 if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub]
      || ![istarget *-linux*] || [skip_shlib_tests]} {
     continue
 }
 
 load_lib prelink-support.exp
 
 set test "attach-pie-misread"
 set srcfile ${test}.c
 set genfile ${objdir}/${subdir}/${test}-gen.h
 set executable ${test}
 set binfile ${objdir}/${subdir}/${executable}
 
-if {[build_executable_own_libs ${test}.exp $executable $srcfile [list "additional_flags=-fPIE -pie"]] == ""} {
+if {[build_executable_own_libs ${test}.exp $executable $srcfile [list additional_flags=-fPIE ldflags=-pie]] == ""} {
     return -1
 }
 
 # Program Headers:
 #   Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
 #   LOAD           0x000000 0x0000000000400000 0x0000000000400000 0x134f5ec 0x134f5ec R E 0x200000
 #   LOAD           0x134f5f0 0x000000000194f5f0 0x000000000194f5f0 0x1dbc60 0x214088 RW  0x200000
 #   DYNAMIC        0x134f618 0x000000000194f618 0x000000000194f618 0x000200 0x000200 RW  0x8
 #
 proc read_phdr {binfile test} {
@@ skipping 49 matching lines @@
 verbose -log "command is $command"
 set result [catch $command output]
 verbose -log "result is $result"
 verbose -log "output is $output"
 if {$result == 0} {
     pass $test
 } else {
     fail $test
 }
 
-set prelink_args [build_executable_own_libs ${test}.exp $executable $srcfile [list "additional_flags=-fPIE -pie -DGEN=\"$genfile\""]]
+set prelink_args [build_executable_own_libs ${test}.exp $executable $srcfile [list "additional_flags=-fPIE -DGEN=\"$genfile\"" "ldflags=-pie"]]
 if {$prelink_args == ""} {
     return -1
 }
 
 # x86_64 file has 25MB, no need to keep it.
 file delete -- $genfile
 
 set phdr [read_phdr $binfile "readelf rebuilt with stub_size"]
 set dynamic_vaddr_prelinkno [lindex $phdr 0]
 
@@ skipping 34 matching lines @@
         return
     }
     timeout {
         fail "$test (timeout)"
         remote_exec host "kill -9 $pid"
         return
     }
 }
 
 # Due to alignments it was reproducible with 1 on x86_64 but 2 on i686.
-foreach align_mult {1 2} {
-    set old_ldprefix $pf_prefix
-    lappend pf_prefix "shift-by-$align_mult:"
+foreach align_mult {1 2} { with_test_prefix "shift-by-$align_mult" {
 
     # FIXME: We believe there is enough room under FIRST_OFFSET.
     set shifted_offset [format 0x%x [expr "$first_offset - $align_mult * $align_max"]]
     verbose -log "shifted_offset is $shifted_offset"
 
     # For normal prelink (prelink_yes call), we need to supply $prelink_args.
     # For the prelink `-r' option below, $prelink_args is not required.
     # Moreover, if it was used, the problem would not longer be reproducible
     # as the libraries would also get relocated.
     set command "exec /usr/sbin/prelink -q -N --no-exec-shield -r $shifted_offset $binfile"
@@ skipping 23 matching lines @@
     gdb_test_multiple "" $test {
         -re "\r\nCannot access memory at address .*$gdb_prompt $" {
             fail $test
         }
         -re "$gdb_prompt $" {
             pass $test
         }
     }
 
     gdb_test "detach" "Detaching from program: .*"
-
-    set pf_prefix $old_ldprefix
-}
+}}
 
 remote_exec host "kill -9 $pid"