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

gcc/ChangeLog

+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

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