Merge GDB 7.5.1

gdb/testsuite/gdb.base/pie-execl.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
@@ skipping 19 matching lines @@
 set srcfile ${testfile}.c
 set executable1 ${testfile}1
 set executable2 ${testfile}2
 set binfile1 ${objdir}/${subdir}/${executable1}
 set binfile2 ${objdir}/${subdir}/${executable2}
 set binfile2_test_msg OBJDIR/${subdir}/${executable2}
 
 # Use conditional compilation according to `BIN' as GDB remembers the source
 # file name of the breakpoint.
 
-set opts [list debug {additional_flags=-fPIE -pie}]
+set opts [list debug additional_flags=-fPIE ldflags=-pie]
 if {[build_executable ${testfile}.exp $executable1 $srcfile [concat $opts {additional_flags=-DBIN=1}]] == ""
     || [build_executable ${testfile}.exp $executable2 $srcfile [concat $opts {additional_flags=-DBIN=2}]] == ""} {
     return -1
 }
 
 clean_restart ${executable1}
 
 gdb_test_no_output "set args ${binfile2}" "set args ${binfile2_test_msg}"
 
 if ![runto_main] {
@@ skipping 41 matching lines @@
 }
 verbose -log "addr2 is $addr2"
 
 # Ensure we cannot get a false PASS and the inferior has really changed.
 set test "pie_execl_marker address has changed"
 if [string equal $addr1 $addr2] {
     fail $test
 } else {
     pass $test
 }