From: Iain Sandoe Date: Thu, 23 Nov 2023 09:44:55 +0000 (+0000) Subject: testsuite, lib: Re-allow mulitple function start labels. X-Git-Tag: basepoints/gcc-15~4340 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a51dc3fc0c2403de999c3b5d9c509f26e2bab4b;p=thirdparty%2Fgcc.git testsuite, lib: Re-allow mulitple function start labels. The change applied in r14-5760-g2a46e0e7e20 changed the behaviour of functions with assembly like: bar: __acle_se_bar: Where both bar and __acle_se_bar are globals refering to the same function body. The old behaviour overrides 'bar' with '__acle_se_bar' and the scan tests for that label. The change here re-allows the override. Case like this are not legal Mach-O (where two global symbols cannot have the same address in the assembler output). However, given the constraints on the Mach-O scanning, it does not seem that it is necessary to skip the change (any incorrect case should be easily evident in the assembler). gcc/testsuite/ChangeLog: * lib/scanasm.exp: Allow multiple function start symbols, taking the last as the function name. Signed-off-by: Iain Sandoe --- diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 4fbf65744e90..d30e3617fe9b 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -877,7 +877,14 @@ proc parse_function_bodies { config filename result } { set in_function 0 } } elseif { $in_function } { - if { [regexp $up_config(end) $line] } { + # We allow multiple function start labels, taking the last one seen + # as the function name. + if { [regexp [lindex $up_config(start) 0] \ + $line dummy maybe_function_name] } { + verbose "parse_function_bodies: overriding $function_name with $maybe_function_name" + set function_name $maybe_function_name + set in_function 1 + } elseif { [regexp $up_config(end) $line] } { verbose "parse_function_bodies: $function_name:\n$function_body" set up_result($function_name) $function_body set in_function 0