[binutils-gdb] [gdb/testsuite] Fix gdb.base/nested-subp{2,3}.exp with recent ld

[binutils-gdb] [gdb/testsuite] Fix gdb.base/nested-subp{2,3}.exp with recent ld

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9693166f6648b3aaa7dc680b3fecda16b63ecfb4

commit 9693166f6648b3aaa7dc680b3fecda16b63ecfb4
Author: Tom de Vries <tdevries@suse.de>
Date:   Wed Oct 12 16:50:16 2022 +0200

    [gdb/testsuite] Fix gdb.base/nested-subp{2,3}.exp with recent ld
    
    On openSUSE Tumbleweed (with ld 2.39) I get for test-case
    gdb.base/nested-subp2.exp:
    ...
    gdb compile failed, ld: warning: tmp.o: requires executable stack \
      (because the .note.GNU-stack section is executable)
    ...
    
    Fix this by compiling with -Wl,--no-warn-execstack.
    
    Likewise in gdb.base/nested-subp3.exp
    
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/gdb.base/nested-subp2.exp | 15 ++++++++++++---
 gdb/testsuite/gdb.base/nested-subp3.exp | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/gdb/testsuite/gdb.base/nested-subp2.exp b/gdb/testsuite/gdb.base/nested-subp2.exp
index efc8dc5c25b..7716e7c8ace 100644
--- a/gdb/testsuite/gdb.base/nested-subp2.exp
+++ b/gdb/testsuite/gdb.base/nested-subp2.exp
@@ -29,10 +29,19 @@ if ![support_nested_function_tests] {
     return -1
 }
 
+set flags {}
+lappend flags debug
+lappend flags additional_flags=-std=gnu99
+
+set ld_flags additional_flags=-Wl,--no-warn-execstack
+if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
+	  $ld_flags] } {
+    lappend flags $ld_flags
+}
+
 if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
-                  [standard_output_file "${testcase}"] \
-                  executable \
-                  [list debug "additional_flags=-std=gnu99"]] != "" } {
+	  [standard_output_file "${testcase}"] \
+	  executable $flags] != "" } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/nested-subp3.exp b/gdb/testsuite/gdb.base/nested-subp3.exp
index fc87631c342..b547b8efd35 100644
--- a/gdb/testsuite/gdb.base/nested-subp3.exp
+++ b/gdb/testsuite/gdb.base/nested-subp3.exp
@@ -29,10 +29,19 @@ if ![support_nested_function_tests] {
     return -1
 }
 
+set flags {}
+lappend flags debug
+lappend flags additional_flags=-std=gnu99
+
+set ld_flags additional_flags=-Wl,--no-warn-execstack
+if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
+	  $ld_flags] } {
+    lappend flags $ld_flags
+}
+
 if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
-                  [standard_output_file "${testcase}"] \
-                  executable \
-                  [list debug "additional_flags=-std=gnu99"]] != "" } {
+	  [standard_output_file "${testcase}"] \
+	  executable $flags] != "" } {
     return -1
 }