Use require dwarf2_support

This changes some tests to use "require dwarf2_support".

gdb/testsuite/gdb.base/until-trailing-insns.exp

@@ -79,10 +79,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    unsupported "dwarf2 support required for this test"
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c .S
 

gdb/testsuite/gdb.compile/compile-ops.exp

@@ -20,9 +20,7 @@ load_lib compile-support.exp
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dbg.S
 

gdb/testsuite/gdb.cp/incomplete-type-overload.exp

@@ -22,7 +22,7 @@ load_lib dwarf.exp
 
 if { [skip_cplus_tests] } { return }
 
-if { ![dwarf2_support] } { return }
+require dwarf2_support
 
 standard_testfile .cc .S
 set asm_file [standard_output_file ${srcfile2}]

gdb/testsuite/gdb.cp/namelessclass.exp

@@ -24,9 +24,7 @@ if {[skip_cplus_tests]} {
 }
 
 # This test can only be run on x86-like targets which support DWARF.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 if {![istarget "x86_64-*-*"] || ![is_lp64_target]} {
     return 0

gdb/testsuite/gdb.cp/nsalias.exp

@@ -18,9 +18,7 @@
 
 load_lib dwarf.exp
 
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 if {[skip_cplus_tests]} {
     return

gdb/testsuite/gdb.dlang/circular.exp

@@ -18,12 +18,7 @@
 load_lib "d-support.exp"
 load_lib "dwarf.exp"
 
-if { [skip_d_tests] } { continue }
-
-# This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require !skip_d_tests dwarf2_support
 
 standard_testfile circular.c circular-dw.S
 

gdb/testsuite/gdb.dlang/watch-loc.exp

@@ -18,12 +18,7 @@
 load_lib "d-support.exp"
 load_lib "dwarf.exp"
 
-if { [skip_d_tests] } { return -1 }
-
-# This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require !skip_d_tests dwarf2_support
 
 standard_testfile watch-loc.c watch-loc-dw.S
 

gdb/testsuite/gdb.dwarf2/ada-cold-name.exp

@@ -18,9 +18,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile ada-linkage-name.c -debug.S
 

gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp

@@ -19,9 +19,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -debug.S
 

gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp

@@ -19,9 +19,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c -debug.S
 

gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dw.S
 

gdb/testsuite/gdb.dwarf2/arr-stride.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c -dw.S
 

gdb/testsuite/gdb.dwarf2/arr-subrange.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c -dw.S
 

gdb/testsuite/gdb.dwarf2/atomic-type.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dw.S
 

gdb/testsuite/gdb.dwarf2/bad-regnum.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c -dw.S
 

gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp

@@ -19,9 +19,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/callframecfa.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Test DW_OP_call_frame_cfa.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 # This test can only be run on x86 targets.
 if {![is_x86_like_target]} {
     return 0  

gdb/testsuite/gdb.dwarf2/calling-convention.exp

@@ -27,9 +27,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c .S
 

gdb/testsuite/gdb.dwarf2/clang-cli-macro.exp

@@ -23,9 +23,7 @@
 
 load_lib dwarf.exp
 
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c .S
 

gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -debug.S -foo.c
 

gdb/testsuite/gdb.dwarf2/clang-debug-names.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -debug.S
 

gdb/testsuite/gdb.dwarf2/clztest.exp

@@ -19,9 +19,7 @@ standard_testfile .S
 set test "clztest"
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if ![dwarf2_support] {
-    return 0  
-}
+require dwarf2_support
 
 # This test can only be run on x86-64 targets.
 if {![istarget x86_64-*] || ![is_lp64_target]} {

gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp

@@ -21,9 +21,7 @@ load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use
 # gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c .S
 

gdb/testsuite/gdb.dwarf2/corrupt.exp

@@ -18,9 +18,7 @@
 
 load_lib dwarf.exp
 
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c .S
 

gdb/testsuite/gdb.dwarf2/count.exp

@@ -18,9 +18,7 @@
 load_lib dwarf.exp
 
 # Only run on targets which support dwarf and gas.
-if { ![dwarf2_support] } {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c .S
 

gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp

@@ -21,9 +21,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -debug.S
 

gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp

@@ -19,9 +19,7 @@
 load_lib "dwarf.exp"
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c cu-no-addrs.S
 

gdb/testsuite/gdb.dwarf2/data-loc.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dw.S
 

gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp

@@ -17,10 +17,7 @@ load_lib dwarf.exp
 # Test with two aranges entries referring to the same CU.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    verbose "Skipping $gdb_test_file_name."
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dw.S
 

gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile _start.c debug-names.S
 

gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile _start.c debug-names.S
 

gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile _start.c debug-names.S
 

gdb/testsuite/gdb.dwarf2/debug-names-non-ascending-cu.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile _start.c debug-names.S
 

gdb/testsuite/gdb.dwarf2/debug-names.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile _start.c debug-names.S
 

gdb/testsuite/gdb.dwarf2/dup-psym.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Minimal DWARF-2 unit test
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile
 

gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/dw2-align.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c -dw.S
 

gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 if {[skip_cplus_tests]} { continue }
 

gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Minimal DWARF-2 unit test
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .S
 set dwarf_srcfile "file1.txt"

gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp

@@ -30,9 +30,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c -other.S -dwarf.S
 

gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .c .S
 

gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .c -2.S
 

gdb/testsuite/gdb.dwarf2/dw2-basic.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Minimal DWARF-2 unit test
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set dwarf_srcfile "file1.txt"

gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp

@@ -19,9 +19,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c -dw.S
 

gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 # Some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags_asm]

gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .c -debug.S
 

gdb/testsuite/gdb.dwarf2/dw2-common-block.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if ![dwarf2_support] {
-    return 0  
-}
+require dwarf2_support
 
 # This test can only be run on x86-64 targets.
 if {![istarget x86_64-*] || ![is_lp64_target]} {

gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 # Some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags_asm]

gdb/testsuite/gdb.dwarf2/dw2-compressed.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Minimal DWARF-2 unit test
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set dwarf_srcfile "file1.txt"

gdb/testsuite/gdb.dwarf2/dw2-const.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp

@@ -21,9 +21,7 @@ if { [skip_cplus_tests] } { continue }
 
 load_lib dwarf.exp
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S -main.c
 

gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp

@@ -20,9 +20,7 @@ load_lib dwarf.exp
 # in the length of the CU.  */
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 # This test has hard-wired assumptions that host and build filenames are
 # the same, and assumes POSIX pathname syntax.

gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp

@@ -25,9 +25,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp

@@ -14,9 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 load_lib dwarf.exp
 
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp

@@ -18,9 +18,7 @@ load_lib dwarf.exp
 # introduced by GCC PR debug/40659.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # This test can only be run on x86_64 targets.
 if {![istarget "x86_64-*-*"] || ![is_lp64_target]} {

gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Test G++ 4.1 producing DW_TAG_namespace with DW_AT_name "::".
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 if { [prepare_for_testing "failed to prepare" "dw2-entry-value" {dw2-entry-value-main.c dw2-entry-value.S} {nodebug}] } {
     return -1

gdb/testsuite/gdb.dwarf2/dw2-error.exp

@@ -16,9 +16,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-filename.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Note: Inspired from dw2-basic.exp.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .S
 set dwarf_srcfile "file1.txt"

gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile dw2-fixed-point.c dw2-fixed-point-dw.S
 

gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp

@@ -19,9 +19,7 @@ load_lib dwarf.exp
 # This is GDB PR symtab/13277.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/dw2-icycle.exp

@@ -18,9 +18,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .S main.c
 

gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp

@@ -18,9 +18,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dw.S
 

gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp

@@ -18,9 +18,7 @@ load_lib dwarf.exp
 # introduced by GCC PR debug/40659.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp

@@ -19,9 +19,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if ![dwarf2_support] {
-    return 0
-}
+require dwarf2_support
 
 # This test can only be run on x86_64 targets.
 if {![istarget "x86_64-*-*"] || ![is_lp64_target]} {

gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp

@@ -53,9 +53,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp

@@ -48,9 +48,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp

@@ -37,9 +37,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp

@@ -26,9 +26,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S -main.c
 

gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp

@@ -27,9 +27,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp

@@ -26,9 +26,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp

@@ -20,9 +20,7 @@ load_lib dwarf.exp
 
 # This test can only be run on targets that support DWARF-2 and use
 # gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c .S
 

gdb/testsuite/gdb.dwarf2/dw2-intercu.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Minimal DWARF-2 unit test
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set dwarf_srcfile "file1.txt"

gdb/testsuite/gdb.dwarf2/dw2-intermix.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Intermixed 32-bit and 64-bit DWARF format tests.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set dwarf_srcfile "file1.txt"

gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp

@@ -26,9 +26,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp

@@ -26,9 +26,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile main.c .S
 

gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp

@@ -15,10 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    verbose "Skipping $gdb_test_file_name."
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp

@@ -21,9 +21,7 @@ if { [skip_cplus_tests] } { continue }
 
 load_lib dwarf.exp
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set executable ${testfile}

gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp

@@ -19,10 +19,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    verbose "Skipping $gdb_test_file_name."
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 # This testfile has reproducibility only with cc-with-index.sh.
 

gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp

@@ -21,9 +21,7 @@ load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use
 # gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dw.S
 

gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 

gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .c .S
 

gdb/testsuite/gdb.dwarf2/dw2-noloc.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 if { [prepare_for_testing "failed to prepare" "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } {
     return -1

gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile
 

gdb/testsuite/gdb.dwarf2/dw2-op-call.exp

@@ -17,9 +17,7 @@ load_lib dwarf.exp
 # Test DW_OP_call2 and DW_OP_call4, PR gdb/10640.
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0   
-}
+require dwarf2_support
 
 standard_testfile .S main.c
 

gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp

@@ -18,9 +18,7 @@ load_lib dwarf.exp
 set test "dw2-op-out-param"
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if ![dwarf2_support] {
-    return 0
-}
+require dwarf2_support
 
 # This test can only be run on x86-64 targets.
 if {![istarget x86_64-*] || ![is_lp64_target]} {

gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0   
-}
+require dwarf2_support
 
 # Some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags_asm]

gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp

@@ -24,9 +24,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0
-}
+require dwarf2_support
 
 standard_testfile .c -dw.S
 

gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp

@@ -19,10 +19,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    verbose "Skipping $gdb_test_file_name."
-    return 0
-}
+require dwarf2_support
 
 # The .c files use __attribute__.
 if ![is_c_compiler_gcc] {

gdb/testsuite/gdb.dwarf2/dw2-param-error.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S -main.c
 

gdb/testsuite/gdb.dwarf2/dw2-producer.exp

@@ -15,9 +15,7 @@
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-if {![dwarf2_support]} {
-    return 0  
-}
+require dwarf2_support
 
 standard_testfile .S
 set dwarf_srcfile "file1.txt"