From 6edba76fe8b37bf2a8f7c84353aa0252724bf293 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 May 2011 17:17:22 +0000 Subject: [PATCH] * lib/gdb.exp (is_x86_like_target): New proc. * gdb.dwarf2/watch-notconst.exp: Use is_x86_like_target. * gdb.dwarf2/valop.exp: Use is_x86_like_target. * gdb.dwarf2/typeddwarf.exp: Use is_x86_like_target. Pass -nostdlib to compiler. * gdb.dwarf2/typeddwarf.S (_start): Rename from 'main'. * gdb.dwarf2/pieces.exp: Use is_x86_like_target. * gdb.dwarf2/implptr.exp: Use is_x86_like_target. * gdb.dwarf2/dw2-restore.exp: Check for LP64. * gdb.dwarf2/callframecfa.exp: Use is_x86_like_target. --- gdb/testsuite/ChangeLog | 13 +++++++++++++ gdb/testsuite/gdb.dwarf2/callframecfa.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-restore.exp | 2 +- gdb/testsuite/gdb.dwarf2/implptr.exp | 2 +- gdb/testsuite/gdb.dwarf2/pieces.exp | 2 +- gdb/testsuite/gdb.dwarf2/typeddwarf.S | 8 ++++---- gdb/testsuite/gdb.dwarf2/typeddwarf.exp | 4 ++-- gdb/testsuite/gdb.dwarf2/valop.exp | 2 +- gdb/testsuite/gdb.dwarf2/watch-notconst.exp | 2 +- gdb/testsuite/lib/gdb.exp | 11 +++++++++++ 10 files changed, 36 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f6ad357..df921b1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2011-05-13 Tom Tromey + + * lib/gdb.exp (is_x86_like_target): New proc. + * gdb.dwarf2/watch-notconst.exp: Use is_x86_like_target. + * gdb.dwarf2/valop.exp: Use is_x86_like_target. + * gdb.dwarf2/typeddwarf.exp: Use is_x86_like_target. Pass + -nostdlib to compiler. + * gdb.dwarf2/typeddwarf.S (_start): Rename from 'main'. + * gdb.dwarf2/pieces.exp: Use is_x86_like_target. + * gdb.dwarf2/implptr.exp: Use is_x86_like_target. + * gdb.dwarf2/dw2-restore.exp: Check for LP64. + * gdb.dwarf2/callframecfa.exp: Use is_x86_like_target. + 2011-05-13 Thiago Jung Bauermann * gdb.python/py-function.exp: Test setting a value from a function diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp index 42c02b0..f88348a 100644 --- a/gdb/testsuite/gdb.dwarf2/callframecfa.exp +++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp @@ -21,7 +21,7 @@ if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. -if {![istarget i?86-*]} { +if {![is_x86_like_target]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp index a04b029..e64c5e5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp @@ -16,7 +16,7 @@ # Test handling of DW_CFA_restore_state. # This test can only be run on x86_64 targets. -if {![istarget x86_64-*]} { +if {![istarget x86_64-*] || ![is_lp64_target]} { return 0 } set testfile "dw2-restore" diff --git a/gdb/testsuite/gdb.dwarf2/implptr.exp b/gdb/testsuite/gdb.dwarf2/implptr.exp index 5bf894b..e9348e40 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr.exp @@ -21,7 +21,7 @@ if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. -if {![istarget i?86-*]} { +if {![is_x86_like_target]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/pieces.exp b/gdb/testsuite/gdb.dwarf2/pieces.exp index 73780d8..a2e6c04 100644 --- a/gdb/testsuite/gdb.dwarf2/pieces.exp +++ b/gdb/testsuite/gdb.dwarf2/pieces.exp @@ -20,7 +20,7 @@ if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. -if {![istarget i?86-*]} { +if {![is_x86_like_target]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/typeddwarf.S b/gdb/testsuite/gdb.dwarf2/typeddwarf.S index a46da14..2ab7444 100644 --- a/gdb/testsuite/gdb.dwarf2/typeddwarf.S +++ b/gdb/testsuite/gdb.dwarf2/typeddwarf.S @@ -212,9 +212,9 @@ f4: .size f4, .-f4 .section .text.startup,"ax",@progbits .p2align 4,,15 - .globl main - .type main, @function -main: + .globl _start + .type _start, @function +_start: .LFB4: # typeddwarf.c:87 .LM37: @@ -314,7 +314,7 @@ main: # SUCC: EXIT [100.0%] ret .LFE4: - .size main, .-main + .size _start, .-_start .comm vv,4,4 .section .rodata.cst4,"aM",@progbits,4 .align 4 diff --git a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp index bddcc18..e6a420a 100644 --- a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp +++ b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp @@ -23,11 +23,11 @@ if ![dwarf2_support] { } # This test can only be run on x86 targets. -if { ![istarget i?86-*] } { +if { ![is_x86_like_target] } { return 0 } -if { [prepare_for_testing "${test}.exp" "${test}" ${test}.S {nodebug}] } { +if { [prepare_for_testing "${test}.exp" "${test}" ${test}.S {nodebug additional_flags=-nostdlib}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/valop.exp b/gdb/testsuite/gdb.dwarf2/valop.exp index f7343ef..4dc7434 100644 --- a/gdb/testsuite/gdb.dwarf2/valop.exp +++ b/gdb/testsuite/gdb.dwarf2/valop.exp @@ -21,7 +21,7 @@ if {![dwarf2_support]} { return 0 } # This test can only be run on x86 targets. -if {![istarget i?86-*]} { +if {![is_x86_like_target]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp index f4e2d52..da13868 100644 --- a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp +++ b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp @@ -22,7 +22,7 @@ if ![dwarf2_support] { } # This test can only be run on x86 targets. -if { ![istarget i?86-*] } { +if { ![is_x86_like_target] } { return 0 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 17ea0b7..531120c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1563,6 +1563,17 @@ proc is_lp64_target {} { return [set is_lp64_target_saved($board) 1] } +# Return 1 if this target is an x86 or x86-64 with -m32. +proc is_x86_like_target {} { + if {[istarget i?86-*]} { + return 1 + } + if {![istarget "x86_64-*-*"]} { + return 0 + } + return [is_ilp32_target] +} + # Run a test on the target to see if it supports vmx hardware. Return 0 if so, # 1 if it does not. Based on 'check_vmx_hw_available' from the GCC testsuite. -- 2.7.4