From 601d22f69093aa98dcf9593bc138da7ba8281e05 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Wed, 28 Jun 2017 09:15:59 +0000 Subject: [PATCH] genmultilib (combination_space): Accept '+' in option names. 2017-06-28 Christophe Lyon gcc/ * genmultilib (combination_space): Accept '+' in option names. From-SVN: r249730 --- gcc/ChangeLog | 4 ++++ gcc/genmultilib | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * genmultilib (combination_space): Accept '+' in option names. + 2017-06-28 Martin Liska 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 -- 2.30.2