fix the triplet regexp to recognize triplets, not only quadruplets
Commit Message
This allows triplets where the vendor is not set. Should go to the trunk and the
7.9 branch.
Matthias
* compile/compile.c (compile_to_object): Allow triplets.
Comments
On 03/23/2015 12:27 PM, Matthias Klose wrote:
> This allows triplets where the vendor is not set. Should go to the trunk and the
> 7.9 branch.
>
> Matthias
>
> * compile/compile.c (compile_to_object): Allow triplets.
>
> --- a/gdb/compile/compile.c
> +++ b/gdb/compile/compile.c
> @@ -483,7 +483,7 @@ compile_to_object (struct command_line *
>
> os_rx = osabi_triplet_regexp (gdbarch_osabi (gdbarch));
> arch_rx = gdbarch_gnu_triplet_regexp (gdbarch);
> - triplet_rx = concat (arch_rx, "-[^-]*-", os_rx, (char *) NULL);
> + triplet_rx = concat (arch_rx, "(-[^-]*)?-", os_rx, (char *) NULL);
Add comment like:
/* Allow triplets with or without vendor set. */
OK with that change.
> make_cleanup (xfree, triplet_rx);
>
> /* Set compiler command-line arguments. */
Thanks,
Pedro Alves
@@ -483,7 +483,7 @@ compile_to_object (struct command_line *
os_rx = osabi_triplet_regexp (gdbarch_osabi (gdbarch));
arch_rx = gdbarch_gnu_triplet_regexp (gdbarch);
- triplet_rx = concat (arch_rx, "-[^-]*-", os_rx, (char *) NULL);
+ triplet_rx = concat (arch_rx, "(-[^-]*)?-", os_rx, (char *) NULL);
make_cleanup (xfree, triplet_rx);
/* Set compiler command-line arguments. */