diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/atomic-type.exp | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/atomic.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp | 18 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp | 14 |
6 files changed, 46 insertions, 13 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 851487f..7ab1228 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2016-07-13 Jan Kratochvil <jan.kratochvil@redhat.com> + + * gdb.dwarf2/atomic-type.exp: Use function_range for low_pc and high_pc. + * gdb.dwarf2/atomic.c (f): Rename f_end_lbl to f_label. + * gdb.dwarf2/dw2-bad-mips-linkage-name.c (f): Rename f_end_lbl to + f_label. + (g): Rename g_end_lbl to g_label. + * gdb.dwarf2/dw2-bad-mips-linkage-name.exp: Use function_range for + low_pc and high_pc. + * gdb.dwarf2/dw2-lexical-block-bare.exp: Likewise. + 2016-07-12 Tom Tromey <tom@tromey.com> PR python/19293: diff --git a/gdb/testsuite/gdb.dwarf2/atomic-type.exp b/gdb/testsuite/gdb.dwarf2/atomic-type.exp index 7b35cad..0addefe 100644 --- a/gdb/testsuite/gdb.dwarf2/atomic-type.exp +++ b/gdb/testsuite/gdb.dwarf2/atomic-type.exp @@ -25,6 +25,12 @@ standard_testfile atomic.c atomic-type-dw.S set asm_file [standard_output_file $srcfile2] Dwarf::assemble $asm_file { + global srcdir subdir srcfile + + set f_result [function_range f ${srcdir}/${subdir}/${srcfile}] + set f_start [lindex $f_result 0] + set f_length [lindex $f_result 1] + cu {} { DW_TAG_compile_unit { {DW_AT_language @DW_LANG_C11} @@ -68,8 +74,8 @@ Dwarf::assemble $asm_file { DW_TAG_subprogram { {name f} - {low_pc [gdb_target_symbol f] addr} - {high_pc f_end_lbl addr} + {low_pc $f_start addr} + {high_pc "$f_start + $f_length" addr} {type :$i_l} } { DW_TAG_formal_parameter { diff --git a/gdb/testsuite/gdb.dwarf2/atomic.c b/gdb/testsuite/gdb.dwarf2/atomic.c index 9a2d37b..ecaa56c 100644 --- a/gdb/testsuite/gdb.dwarf2/atomic.c +++ b/gdb/testsuite/gdb.dwarf2/atomic.c @@ -28,7 +28,7 @@ main (void) int f (char *x) { - asm (".global f_end_lbl\nf_end_lbl:"); + asm ("f_label: .globl f_label"); return 0; } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.c b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.c index eaf1233..5816324 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.c +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.c @@ -28,7 +28,7 @@ main (void) int f (char *x) { - asm (".global f_end_lbl\nf_end_lbl:"); + asm ("f_label: .globl f_label"); return 0; } @@ -36,6 +36,6 @@ f (char *x) int g (char *x) { - asm (".global g_end_lbl\ng_end_lbl:"); + asm ("g_label: .globl g_label"); return 0; } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp index b1041fa..043c1da 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp @@ -26,6 +26,16 @@ standard_testfile dw2-bad-mips-linkage-name.c dw2-bad-mips-linkage-name.S set asm_file [standard_output_file $srcfile2] Dwarf::assemble $asm_file { + global srcdir subdir srcfile + + set f_result [function_range f ${srcdir}/${subdir}/${srcfile}] + set f_start [lindex $f_result 0] + set f_length [lindex $f_result 1] + + set g_result [function_range g ${srcdir}/${subdir}/${srcfile}] + set g_start [lindex $g_result 0] + set g_length [lindex $g_result 1] + cu {} { DW_TAG_compile_unit { {DW_AT_language @DW_LANG_C} @@ -42,15 +52,15 @@ Dwarf::assemble $asm_file { } DW_TAG_subprogram { {name f} - {low_pc [gdb_target_symbol f] addr} - {high_pc f_end_lbl addr} + {low_pc $f_start addr} + {high_pc "$f_start + $f_length" addr} {type :$b_l} {DW_AT_MIPS_linkage_name _Z1fv} } DW_TAG_subprogram { {name g} - {low_pc [gdb_target_symbol g] addr} - {high_pc g_end_lbl addr} + {low_pc $g_start addr} + {high_pc "$g_start + $g_length" addr} {type :$b_l} {DW_AT_MIPS_linkage_name 42 DW_FORM_data1} } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp index 3f9411e..d09f56b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp @@ -24,10 +24,16 @@ standard_testfile .S main.c # Make some DWARF for the test. set asm_file [standard_output_file $srcfile] Dwarf::assemble $asm_file { + global srcdir subdir srcfile2 + + set main_result [function_range main ${srcdir}/${subdir}/${srcfile2}] + set main_start [lindex $main_result 0] + set main_length [lindex $main_result 1] + cu {} { compile_unit { - {low_pc [gdb_target_symbol main] DW_FORM_addr} - {high_pc [gdb_target_symbol main]+0x10000 DW_FORM_addr} + {low_pc $main_start addr} + {high_pc "$main_start + $main_length" addr} } { declare_labels integer_label @@ -40,8 +46,8 @@ Dwarf::assemble $asm_file { DW_TAG_subprogram { {name main} {DW_AT_external 1 flag} - {low_pc [gdb_target_symbol main] DW_FORM_addr} - {high_pc [gdb_target_symbol main]+0x10000 DW_FORM_addr} + {low_pc $main_start addr} + {high_pc "$main_start + $main_length" addr} } { DW_TAG_lexical_block { } { |