[binutils-gdb] [gdb/testsuite] Fix gdb.dwarf2/macro-source-path.exp with -m32

[binutils-gdb] [gdb/testsuite] Fix gdb.dwarf2/macro-source-path.exp with -m32

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5be49e265d617f91d78d2d87fa8166e5cf6f83a2

commit 5be49e265d617f91d78d2d87fa8166e5cf6f83a2
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Oct 13 12:18:39 2022 +0200

    [gdb/testsuite] Fix gdb.dwarf2/macro-source-path.exp with -m32
    
    With test-case gdb.dwarf2/macro-source-path.exp and target board unix/-m32, I
    run into:
    ...
    as: macro-source-path-gcc11-ld238-dw5-filename-641.o: \
      unsupported relocation type: 0x1^M
    ...
    
    The problem is that we have 64-bit dwarf so the debug_line offset in the
    .debug_macro section is an 8-byte entity, emitted using ".8byte":
    ...
            .section .debug_macro
    .Lcu_macros4:
            .2byte        5                 /* version */
            .byte        3                  /* flags */
            .8byte        .LLlines3         /* debug_line offset */
    ...
    but the linker doesn't support 8-byte relocation types on a 32-bit architecture.
    
    This is similar to what was fixed in commit a5ac8e7fa3b
    ("[gdb/testsuite] Fix 64-bit dwarf test-cases with -m32") for for instance
    .debug_abbrev.
    
    Fix this in the same way, by using _op_offset to emit the debug_line offset.
    
    Tested on x86_64-linux with native and target board unix/-m32.

Diff:
---
 gdb/testsuite/lib/dwarf.exp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp
index b85ec290299..586c98ececc 100644
--- a/gdb/testsuite/lib/dwarf.exp
+++ b/gdb/testsuite/lib/dwarf.exp
@@ -2224,11 +2224,8 @@ namespace eval Dwarf {
 	_op .byte $flags "flags"
 
 	if { ${debug-line-offset-label} != "" } {
-	    if { ${is-64} } {
-		_op .8byte ${debug-line-offset-label} "debug_line offset"
-	    } else {
-		_op .4byte ${debug-line-offset-label} "debug_line offset"
-	    }
+	    _op_offset [expr ${is-64} ? 8 : 4] ${debug-line-offset-label} \
+		"debug_line offset"
 	}
 
 	with_override Dwarf::define Dwarf::_macro_unit_define {