]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
testsuite, lib: Re-allow mulitple function start labels.
authorIain Sandoe <iain@sandoe.co.uk>
Thu, 23 Nov 2023 09:44:55 +0000 (09:44 +0000)
committerIain Sandoe <iain@sandoe.co.uk>
Thu, 23 Nov 2023 19:54:04 +0000 (19:54 +0000)
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 <iain@sandoe.co.uk>
gcc/testsuite/lib/scanasm.exp

index 4fbf65744e90ee7744afc72e8c7d8828d3379050..d30e3617fe9b5908028533efd87076a431ed57ce 100644 (file)
@@ -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