From 6cb22d4a8e8f7852bc2202543a573ca8d011c421 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 22 Nov 2021 09:14:15 +0100 Subject: [PATCH] [gdb/testsuite] Support .debug_line v4 in dwarf assembler The .debug_line header got a new field in v4: maximum_operations_per_instruction. Generate this field in the dwarf assembler, for now hardcoding the value to 1, meaning non-VLIW. Tested on x86_64-linux. --- gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +- gdb/testsuite/lib/dwarf.exp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp index cde602fd468..5a5888a467e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp @@ -137,7 +137,7 @@ set cv_low 2 set cv_high 4 set lv_low 2 -set lv_high 3 +set lv_high 4 for { set cv $cv_low } { $cv <= $cv_high } { incr cv } { for { set lv $lv_low } { $lv <= $lv_high } { incr lv } { diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index d6126ca2598..fd914c365ba 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -2239,6 +2239,10 @@ namespace eval Dwarf { define_label $header_len_label _op .byte 1 "minimum_instruction_length" + if { $_unit_version >= 4 } { + # Assume non-VLIW for now. + _op .byte 1 "maximum_operations_per_instruction" + } _op .byte $_default_is_stmt "default_is_stmt" _op .byte 1 "line_base" _op .byte 1 "line_range" -- 2.30.2