diff options
-rw-r--r-- | gdb/testsuite/gdb.base/break-main-file-remove-fail.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/dprintf-detach.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/info-os.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/siginfo-threads.exp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp index 41c3114..444b1d3 100644 --- a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp +++ b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp @@ -87,7 +87,9 @@ proc test_remove_bp { initial_load } { # should warn the user about it. set pagesize [get_integer_valueof "pg_size" 0] set align_addr [expr $bp_addr - $bp_addr % $pagesize] - set munmap [get_integer_valueof "(int) munmap ($align_addr, $pagesize)" -1] + set munmap_prototype "int (*) (void *, size_t)" + set munmap_expr "(($munmap_prototype) munmap) ($align_addr, $pagesize)" + set munmap [get_integer_valueof $munmap_expr -1] if {$munmap != 0} { unsupported "can't munmap foo's page" diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp index 692048f..b6da01a 100644 --- a/gdb/testsuite/gdb.base/dprintf-detach.exp +++ b/gdb/testsuite/gdb.base/dprintf-detach.exp @@ -52,7 +52,7 @@ proc dprintf_detach_test { breakpoint_always_inserted dprintf_style disconnected # Get PID of test program. set inferior_pid -1 set test "get inferior process ID" - gdb_test_multiple "call (int) getpid ()" $test { + gdb_test_multiple "call ((int (*) (void)) getpid) ()" $test { -re ".* = ($decimal).*$gdb_prompt $" { set inferior_pid $expect_out(1,string) pass $test diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp index 7967e2e..d12f875 100644 --- a/gdb/testsuite/gdb.base/info-os.exp +++ b/gdb/testsuite/gdb.base/info-os.exp @@ -39,7 +39,7 @@ if ![runto_main] then { # Get PID of test program. set inferior_pid "" set test "get inferior process ID" -gdb_test_multiple "call (int) getpid()" $test { +gdb_test_multiple "call ((int (*) (void)) getpid) ()" $test { -re ".* = ($decimal).*$gdb_prompt $" { set inferior_pid $expect_out(1,string) pass $test diff --git a/gdb/testsuite/gdb.threads/siginfo-threads.exp b/gdb/testsuite/gdb.threads/siginfo-threads.exp index f10c7fd..8dd34b7 100644 --- a/gdb/testsuite/gdb.threads/siginfo-threads.exp +++ b/gdb/testsuite/gdb.threads/siginfo-threads.exp @@ -41,7 +41,7 @@ gdb_breakpoint [gdb_get_line_number "break-at-exit"] set test "get pid" set pid "" -gdb_test_multiple "p (int) getpid ()" $test { +gdb_test_multiple "p ((int (*) (void))getpid) ()" $test { -re " = (\[0-9\]+)\r\n$gdb_prompt $" { set pid $expect_out(1,string) pass $test |