# could be assigned during continuation of a thread with pending SIGTRAP to the
# different/new watchpoint, just based on the watchpoint/debug register number.
-if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
- && ![istarget "ia64-*-*"])
- || [target_info exists gdb,no_hardware_watchpoints]
+if {[skip_hw_watchpoint_access_tests]
+ || [skip_hw_watchpoint_multi_tests]
|| ![istarget *-*-linux*]} {
return 0
}