On Thu, Dec 15, 2022 at 02:03:36PM +0100, Andreas Schwab wrote:
> On Dez 15 2022, Jakub Jelinek via Gcc-rust wrote:
>
> > @@ -58,13 +60,15 @@ proc check_compile {basename type conten
> > set options ""
> > }
> > switch -glob -- $contents {
> > - "*/* Assembly*" { set src ${basename}[pid].S }
> > + "*/\* Assembly*" { set src ${basename}[pid].S }
> > "*! Fortran*" { set src ${basename}[pid].f90 }
> > "*// C++*" { set src ${basename}[pid].cc }
> > "*// D*" { set src ${basename}[pid].d }
> > "*// ObjC++*" { set src ${basename}[pid].mm }
> > "*/* ObjC*" { set src ${basename}[pid].m }
>
> You probably want to quote the * here too.
You're right on both, I've committed this follow-up
after verifying that Assembly test still works (it works even with \\\*
but doesn't with \\\\*) and verifying that changing
check_effective_target_property_1_needed
to have // Assembly instead of /* Assembly incorrectly works with
"*/* Assembly*", "*/\* Assembly*" but correctly doesn't work with
"*/\\* Assembly*" or "*/\\\* Assembly*".
Committed to trunk. Sorry.
2022-12-15 Jakub Jelinek <ja...@redhat.com>
* lib/target-supports.exp (check_compile): Further quoting
fixes for /* Assembly, /* ObjC and (* Modula-2 *) checks.
--- gcc/testsuite/lib/target-supports.exp.jj 2022-12-15 13:57:40.000000000
+0100
+++ gcc/testsuite/lib/target-supports.exp 2022-12-15 14:14:02.987854385
+0100
@@ -60,15 +60,15 @@ proc check_compile {basename type conten
set options ""
}
switch -glob -- $contents {
- "*/\* Assembly*" { set src ${basename}[pid].S }
+ "*/\\* Assembly*" { set src ${basename}[pid].S }
"*! Fortran*" { set src ${basename}[pid].f90 }
"*// C++*" { set src ${basename}[pid].cc }
"*// D*" { set src ${basename}[pid].d }
"*// ObjC++*" { set src ${basename}[pid].mm }
- "*/* ObjC*" { set src ${basename}[pid].m }
+ "*/\\* ObjC*" { set src ${basename}[pid].m }
"*// Go*" { set src ${basename}[pid].go }
"*// Rust*" { set src ${basename}[pid].rs }
- "*(\* Modula-2*" { set src ${basename}[pid].mod }
+ "*(\\* Modula-2*" { set src ${basename}[pid].mod }
default {
switch -- $tool {
"objc" { set src ${basename}[pid].m }
Jakub
