This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [patch] fix the triplet regexp to recognize triplets, not only quadruplets
- From: Matthias Klose <doko at ubuntu dot com>
- To: Pedro Alves <palves at redhat dot com>, gdb-patches at sourceware dot org
- Date: Fri, 27 Mar 2015 16:15:35 +0100
- Subject: Re: [patch] fix the triplet regexp to recognize triplets, not only quadruplets
- Authentication-results: sourceware.org; auth=none
- References: <551006B4 dot 2040404 at ubuntu dot com> <5513D980 dot 7000002 at redhat dot com>
On 03/26/2015 11:03 AM, Pedro Alves wrote:
> 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.
updated patch attached. Please could somebody commit the patch?
Matthias
* compile/compile.c (compile_to_object): Allow triplets with or without vendor set.
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -483,7 +483,9 @@ 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);
+
+ /* Allow triplets with or without vendor set. */
+ triplet_rx = concat (arch_rx, "(-[^-]*)?-", os_rx, (char *) NULL);
make_cleanup (xfree, triplet_rx);
/* Set compiler command-line arguments. */