Re: Fix genmultilib reuse rule checks for large sets of option combinations

[Christophe Lyon]

On 28 June 2017 at 10:14, Andreas Schwab <sch...@suse.de> wrote:
> On Jun 28 2017, Christophe Lyon <christophe.l...@linaro.org> wrote:
>
>> diff --git a/gcc/genmultilib b/gcc/genmultilib
>> index 0767e68..e65a0dd 100644
>> --- a/gcc/genmultilib
>> +++ b/gcc/genmultilib
>> @@ -462,7 +462,7 @@ echo "};"
>>  # Generate a regular expression to validate option combinations.
>>  options_re=
>>  for set in ${options}; do
>> -  for opt in `echo ${set} | sed -e 's_[/|]_ _g'`; do
>> +  for opt in `echo ${set} | sed -e 's_[/|]_ _g' | sed -e 's/\+/./g' `; do
>
> No need to run two seds, just pass -e twice.  Also, + isn't special, so
> no backslash.
>
Indeed, thanks.

Here is what I have committed (r249730)

Christophe

> Andreas.
>
> --
> Andreas Schwab, SUSE Labs, sch...@suse.de
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."

2017-06-28  Christophe Lyon  <christophe.l...@linaro.org>

        * genmultilib (combination_space): Accept '+' in option names.

diff --git a/gcc/genmultilib b/gcc/genmultilib
index 0767e68..1da3a6e 100644
--- a/gcc/genmultilib
+++ b/gcc/genmultilib
@@ -462,7 +462,7 @@ echo "};"
 # Generate a regular expression to validate option combinations.
 options_re=
 for set in ${options}; do
-  for opt in `echo ${set} | sed -e 's_[/|]_ _g'`; do
+  for opt in `echo ${set} | sed -e 's_[/|]_ _g' -e 's/+/./g' `; do
     options_re="${options_re}${options_re:+|}${opt}"
   done
 done