diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a70b03dd9ed..d7b45ef8c6d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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
diff --git a/gcc/genmultilib b/gcc/genmultilib
index 0767e68719e..1da3a6ed79c 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