[gdb/testsuite] Use pie instead of -fPIE -pie

Replace {additional_flags=-fPIE ldflags=-pie} with {pie}.

This makes sure that the test-cases properly error out when using target board
unix/-fno-PIE/-no-pie.

Tested on x86_64-linux.

diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp
index e10357655813105c7b772ec58caf9b17f6f728cc..ad8175373c028b202dc1b1261c2ce0a8145a2628 100644 (file)
--- a/gdb/testsuite/gdb.base/attach-pie-misread.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp
@@ -25,7 +25,8 @@ standard_testfile .c
 set genfile [standard_output_file ${testfile}-gen.h]
 set executable $testfile
 
-if {[build_executable_own_libs ${testfile}.exp $executable $srcfile [list additional_flags=-fPIE ldflags=-pie]] == ""} {
+if {[build_executable_own_libs ${testfile}.exp $executable $srcfile \
+        {pie}] == ""} {
     return -1
 }
 
@@ -95,7 +96,8 @@ if {$result == 0} {
     fail $test
 }
 
-set prelink_args [build_executable_own_libs ${test}.exp $executable $srcfile [list "additional_flags=-fPIE -DGEN=\"$genfile\"" "ldflags=-pie"]]
+set prelink_args [build_executable_own_libs ${test}.exp $executable $srcfile \
+                     [list pie "additional_flags=-DGEN=\"$genfile\""]]
 if {$prelink_args == ""} {
     return -1
 }
@@ -118,7 +120,7 @@ verbose -log "first_offset is $first_offset"
 
 set test "first offset is non-zero"
 if {$first_offset == 0} {
-    fail "$test (-fPIE -pie in effect?)"
+    fail "$test (failing because PIE is not effect?)"
 } else {
     pass $test
 }

diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
index 32e5c7ddc3a4c1653b8a3d415bf881f62f08c019..ae3d0bc64d96ffece6c4ca553cf76bc7b7179581 100644 (file)
--- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
@@ -20,7 +20,7 @@ if {![can_spawn_for_attach]} {
 standard_testfile .c
 set executable ${testfile}
 
-if { [prepare_for_testing "failed to prepare" $executable "" [list debug "additional_flags=-fPIE" "ldflags=-pie"]] } {
+if { [prepare_for_testing "failed to prepare" $executable "" [list debug pie]] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/jit-attach-pie.exp b/gdb/testsuite/gdb.base/jit-attach-pie.exp
index 51269eb9132438c6f3039638210090351c2e5749..4171584942ba25f9fdff85d8d61fefd20e2ac1b8 100644 (file)
--- a/gdb/testsuite/gdb.base/jit-attach-pie.exp
+++ b/gdb/testsuite/gdb.base/jit-attach-pie.exp
@@ -21,7 +21,7 @@ standard_testfile .c
 set executable ${testfile}
 
 if { [build_executable ${testfile}.exp $executable $srcfile \
-                         [list debug pthreads "additional_flags=-fPIE" "ldflags=-pie"]] } {
+                         [list debug pthreads pie]] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/jit-elf.exp b/gdb/testsuite/gdb.base/jit-elf.exp
index 2018814df7e3f250649aaaa9c7813de38e3b11c7..7e13f6ae9beeaac3d62f792661490d309c3a9edf 100644 (file)
--- a/gdb/testsuite/gdb.base/jit-elf.exp
+++ b/gdb/testsuite/gdb.base/jit-elf.exp
@@ -158,8 +158,7 @@ if {[can_spawn_for_attach]} {
     }
 }
 
-if { [compile_jit_main ${main_srcfile} "${main_binfile}-pie" \
-         {additional_flags=-fPIE ldflags=-pie}] == 0 } {
+if { [compile_jit_main ${main_srcfile} "${main_binfile}-pie" pie] == 0 } {
     with_test_prefix PIE {
        one_jit_test [lindex $jit_solibs_target 0] "${hex}  jit_function_0001" 0
     }

diff --git a/gdb/testsuite/gdb.base/pie-execl.exp b/gdb/testsuite/gdb.base/pie-execl.exp
index 71bc8beebe7f7ed040697143e9e964f423cbe337..33b3aa06e506478f79889cdefdaef940bccaee1a 100644 (file)
--- a/gdb/testsuite/gdb.base/pie-execl.exp
+++ b/gdb/testsuite/gdb.base/pie-execl.exp
@@ -41,7 +41,7 @@ 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 ldflags=-pie]
+set opts [list debug pie]
 if {[build_executable ${testfile}.exp $executable1 $srcfile [concat $opts {additional_flags=-DBIN=1}]] == -1
     || [build_executable ${testfile}.exp $executable2 $srcfile [concat $opts {additional_flags=-DBIN=2}]] == -1} {
     return -1

diff --git a/gdb/testsuite/gdb.base/pie-fork.exp b/gdb/testsuite/gdb.base/pie-fork.exp
index 54932fe39ab6c2972b098068d7602a45a5894f4f..d093c195da0e30ee2129feb6993a5e820032f950 100644 (file)
--- a/gdb/testsuite/gdb.base/pie-fork.exp
+++ b/gdb/testsuite/gdb.base/pie-fork.exp
@@ -18,7 +18,7 @@
 
 standard_testfile
 
-set opts [list debug additional_flags=-fPIE ldflags=-pie]
+set opts [list debug pie]
 
 if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
     return

diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
index c74caf43dfc475c34b23edf76ccff825c4cc92fd..7ab30f2fde032b083b6fd8a2f2660ce2ff0169dd 100644 (file)
--- a/gdb/testsuite/gdb.base/reread.exp
+++ b/gdb/testsuite/gdb.base/reread.exp
@@ -14,9 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Build programs in PIE mode, to reproduce PR 21555.
-foreach_with_prefix opts {
-    { "" "" }
-    { "-fPIE" "ldflags=-pie" } } {
+foreach_with_prefix opts { "" "pie" } {
 
        # build the first test case
 
@@ -25,9 +23,7 @@ foreach_with_prefix opts {
        # Cygwin needs $EXEEXT.
        set binfile1 [standard_output_file ${testfile1}$EXEEXT]
 
-       set testfile1_opt [list debug nowarnings \
-                              additional_flags=[lindex $opts 0] \
-                              [lindex $opts 1] ]
+       set testfile1_opt [list debug nowarnings $opts]
        if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" \
                   executable ${testfile1_opt}] != "" } {
            untested "failed to compile first testcase"
@@ -40,12 +36,9 @@ foreach_with_prefix opts {
        set srcfile2 ${testfile2}.c
        set binfile2 [standard_output_file ${testfile2}$EXEEXT]
 
-       set testfile2_opt1 [list debug nowarnings \
-                               additional_flags=[lindex $opts 0] \
-                               [lindex $opts 1]]
-       set testfile2_op2 [list debug nowarnings \
-                              "additional_flags=-DNO_SECTIONS [lindex $opts 0]" \
-                              [lindex $opts 1]]
+       set testfile2_opt1 [list debug nowarnings $opts]
+       set testfile2_op2 [list debug nowarnings $opts \
+                              "additional_flags=-DNO_SECTIONS"]
        if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" \
                   executable ${testfile2_opt1}] != ""
              && [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" \

diff --git a/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp b/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
index 714a07e97d7a9fb1fe981dc6f1df7d04716743a7..f0ba05f73db20e43e533555f172a4714358fb140 100644 (file)
--- a/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
@@ -16,7 +16,7 @@
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
-                         [list "additional_flags=-fPIE -pie"]] != "" } {
+        {pie}] != "" } {
     return -1
 }