2010-12-05 Yao Qi * gdb.asm/asm-source.exp: Replace ARM target triplet with a canonical form. Remove "xscale-*-*" * gdb.xml/tdesc-regs.exp: Likewise. * gdb.python/py-section-script.exp: Replace ARM target triplet with canonical form. Match arm*-*-symbianelf*. * gdb.base/dup-sect.exp: Likewise. * lib/dwarf.exp: New. * gdb.dwarf2/callframecfa.exp: Check dwarf2 support by routine dwarf2_support. * gdb.dwarf2/dup-psym.exp: Likewise. * gdb.dwarf2/dw2-ada-ffffffff.exp: Likewise. * gdb.dwarf2/dw2-anonymous-func.exp: Likewise. * gdb.dwarf2/dw2-bad-parameter-type.exp: Likewise. * gdb.dwarf2/dw2-basic.exp: Likewise. * gdb.dwarf2/dw2-compressed.exp: Likewise. * gdb.dwarf2/dw2-const.exp: Likewise. * gdb.dwarf2/dw2-cp-infcall-ref-static.exp: Likewise. * gdb.dwarf2/dw2-cu-size.exp: Likewise. * gdb.dwarf2/dw2-double-set-die-type.exp: Likewise. * gdb.dwarf2/dw2-empty-namespace.exp: Likewise. * gdb.dwarf2/dw2-filename.exp: Likewise. * gdb.dwarf2/dw2-inheritance.exp: Likewise. * gdb.dwarf2/dw2-inline-param.exp: Likewise. * gdb.dwarf2/dw2-intercu.exp: Likewise. * gdb.dwarf2/dw2-intermix.exp: Likewise. * gdb.dwarf2/dw2-modula2-self-type.exp: Likewise. * gdb.dwarf2/dw2-noloc.exp: Likewise. * gdb.dwarf2/dw2-op-call.exp: Likewise. * gdb.dwarf2/dw2-producer.exp: Likewise. * gdb.dwarf2/dw2-ranges.exp: Likewise. * gdb.dwarf2/dw2-ref-missing-frame.exp: Likewise. * gdb.dwarf2/dw2-stack-boundary.exp: Likewise. * gdb.dwarf2/dw2-strp.exp: Likewise. * gdb.dwarf2/dw2-unresolved.exp: Likewise. * gdb.dwarf2/implptr.exp: Likewise. * gdb.dwarf2/mac-fileno.exp: Likewise. * gdb.dwarf2/member-ptr-forwardref.exp: Likewise. * gdb.dwarf2/pieces.exp: Likewise. * gdb.dwarf2/pr11465.exp: Likewise. * gdb.dwarf2/valop.exp: Likewise. * gdb.dwarf2/watch-notconst.exp: Likewise. * gdb.mi/dw2-ref-missing-frame.exp: Likewise. diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp index 9053711..b64286b 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -40,10 +40,7 @@ switch -glob -- [istarget] { set asm-flags "-no-mdebug -I${srcdir}/${subdir} -I${objdir}/${subdir}" set debug-flags "-gdwarf-2" } - "*arm-*-*" { - set asm-arch arm - } - "xscale-*-*" { + "*arm*-*-*" { set asm-arch arm } "frv-*-*" { diff --git a/gdb/testsuite/gdb.base/dup-sect.exp b/gdb/testsuite/gdb.base/dup-sect.exp index 08ab1d0..1961dca 100644 --- a/gdb/testsuite/gdb.base/dup-sect.exp +++ b/gdb/testsuite/gdb.base/dup-sect.exp @@ -27,7 +27,8 @@ if {![istarget *-*-linux*] && ![istarget *-*-gnu*] && ![istarget *-*-elf*] - && ![istarget arm-*-eabi*] + && ![istarget arm*-*-eabi*] + && ![istarget arm*-*-symbianelf*] && ![istarget powerpc-*-eabi*]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp index 3ec1326..a970749 100644 --- a/gdb/testsuite/gdb.dwarf2/callframecfa.exp +++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +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. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.exp b/gdb/testsuite/gdb.dwarf2/dup-psym.exp index f4104d8..6fd487a 100644 --- a/gdb/testsuite/gdb.dwarf2/dup-psym.exp +++ b/gdb/testsuite/gdb.dwarf2/dup-psym.exp @@ -12,16 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp index 27fd957..50ad6cd 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp index 10662eb..06b3cbb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp index fcfbb9a..1d405b4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp index b11bf25..39bd7a2 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp index 23ac9b2..3690fc4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-const.exp b/gdb/testsuite/gdb.dwarf2/dw2-const.exp index d7bf46f..2063399 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-const.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-const.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp index 08ef528..c322f12 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp @@ -19,14 +19,10 @@ # Still no C++ compiler is used. if { [skip_cplus_tests] } { continue } +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp index 11e131c..c8eaeb8 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp @@ -12,6 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Test inter-cu references where the referenced DIE is within # initial_length_size bytes of the end of the CU. @@ -20,12 +21,7 @@ # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp index 50b1182..25ea26b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp @@ -12,18 +12,14 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Test DW_TAG_inheritance using constant DW_AT_data_member_location # introduced by GCC PR debug/40659. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp index d491eaf..755c346 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +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. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp index e1afe64..8ce37e7 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +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. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp b/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp index 787eab9..9ee5c85 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp @@ -12,18 +12,14 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Test DW_TAG_inheritance using constant DW_AT_data_member_location # introduced by GCC PR debug/40659. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp index e9ead8e..9f23ee5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp index 9094405..c4fdf3b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Minimal DWARF-2 unit test # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp index 4022cce..16a341b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +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. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp index 3ec69fa..df44e51 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp index 2c336ef..9f7572f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp index 5b5fefd..2260dde 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp @@ -12,18 +12,14 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +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. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { - return 0 +if {![dwarf2_support]} { + return 0 } set testfile "dw2-op-call" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp index 3edc1fe..99bb241 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp index 71b01e6..e3fd4a1 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp @@ -12,18 +12,14 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Test DW_TAG_compile_unit with no children and with neither DW_AT_low_pc nor # DW_AT_high_pc but with DW_AT_ranges instead. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { verbose "Skipping DW_AT_ranges test." return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp index d2874ba..48b37bd 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp index 90bc9dc..1bb5a0e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp index 536f773..bec8077 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp @@ -12,18 +12,14 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Test printint string variables that are optimized out because they # are unreferenced in code, and whose contents appear in .debug_str. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp index 4c6de1f..a39edf0 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/implptr.exp b/gdb/testsuite/gdb.dwarf2/implptr.exp index fa39908..50939f5 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Test DW_OP_GNU_implicit_pointer. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp index 184f585..12e6a36 100644 --- a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp +++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp @@ -12,18 +12,14 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Check that GDB can gracefully handle macro information that has # bogus file numbers. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp index 7a72e53..066c111 100644 --- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp +++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/pieces.exp b/gdb/testsuite/gdb.dwarf2/pieces.exp index 1e3ef7f..db6df17 100644 --- a/gdb/testsuite/gdb.dwarf2/pieces.exp +++ b/gdb/testsuite/gdb.dwarf2/pieces.exp @@ -12,17 +12,12 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . - +load_lib dwarf.exp # Test some DWARF piece operators. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. diff --git a/gdb/testsuite/gdb.dwarf2/pr11465.exp b/gdb/testsuite/gdb.dwarf2/pr11465.exp index d2d6596..a0a1492 100644 --- a/gdb/testsuite/gdb.dwarf2/pr11465.exp +++ b/gdb/testsuite/gdb.dwarf2/pr11465.exp @@ -12,15 +12,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/valop.exp b/gdb/testsuite/gdb.dwarf2/valop.exp index adde3ad..2c00077 100644 --- a/gdb/testsuite/gdb.dwarf2/valop.exp +++ b/gdb/testsuite/gdb.dwarf2/valop.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # Test DW_OP_stack_value and DW_OP_implicit_value. # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. diff --git a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp index e0b3d33..ccc398f 100644 --- a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp +++ b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp @@ -12,17 +12,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp set test "watch-notconst" # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if ![dwarf2_support] { return 0 } diff --git a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp index cd29de5..de537d0 100644 --- a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp +++ b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp @@ -13,17 +13,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. # For now pick a sampling of likely targets. load_lib mi-support.exp set MIFLAGS "-i=mi" -if {![istarget *-*-linux*] - && ![istarget *-*-gnu*] - && ![istarget *-*-elf*] - && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] - && ![istarget powerpc-*-eabi*]} { +if {![dwarf2_support]} { return 0 } diff --git a/gdb/testsuite/gdb.python/py-section-script.exp b/gdb/testsuite/gdb.python/py-section-script.exp index 8a93ca8..a62020b 100644 --- a/gdb/testsuite/gdb.python/py-section-script.exp +++ b/gdb/testsuite/gdb.python/py-section-script.exp @@ -22,7 +22,7 @@ if {![istarget *-*-linux*] && ![istarget *-*-gnu*] && ![istarget *-*-elf*] && ![istarget *-*-openbsd*] - && ![istarget arm-*-eabi*] + && ![istarget arm*-*-eabi*] && ![istarget powerpc-*-eabi*]} { verbose "Skipping py-section-script.exp because of lack of support." return diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp index f37b2f3..63239de 100644 --- a/gdb/testsuite/gdb.xml/tdesc-regs.exp +++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp @@ -27,10 +27,7 @@ set core-regs "" set regdir "" set architecture "" switch -glob -- [istarget] { - "*arm-*-*" { - set core-regs {arm-core.xml} - } - "xscale-*-*" { + "arm*-*-*" { set core-regs {arm-core.xml} } "*m68k-*-*" { diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp new file mode 100644 index 0000000..6832691 --- /dev/null +++ b/gdb/testsuite/lib/dwarf.exp @@ -0,0 +1,29 @@ +# Copyright 2010 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 . + +# This test can only be run on targets which support DWARF-2 and use gas. +proc dwarf2_support {} { + if {![istarget *-*-linux*] + && ![istarget *-*-gnu*] + && ![istarget *-*-elf*] + && ![istarget *-*-openbsd*] + && ![istarget arm*-*-eabi*] + && ![istarget arm*-*-symbianelf*] + && ![istarget powerpc-*-eabi*]} { + return 0 + } + + return 1 +}