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

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

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

From-SVN: r249730
This commit is contained in:
Christophe Lyon 2017-06-28 09:15:59 +00:00 committed by Christophe Lyon
parent b8d62ac826
commit 601d22f690
2 changed files with 5 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2017-06-28 Christophe Lyon <christophe.lyon@linaro.org>
* genmultilib (combination_space): Accept '+' in option names.
2017-06-28 Martin Liska <mliska@suse.cz>
PR sanitizer/81224

View File

@ -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