diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-06-28 09:15:59 +0000 |
|---|---|---|
| committer | Christophe Lyon <clyon@gcc.gnu.org> | 2017-06-28 11:15:59 +0200 |
| commit | 601d22f69093aa98dcf9593bc138da7ba8281e05 (patch) | |
| tree | d8bb7a390361463b805f49c5579d9bdc8b5dbab6 | |
| parent | b8d62ac8265fc701425d9046d5ed2b6d832b71ef (diff) | |
| download | gcc-601d22f69093aa98dcf9593bc138da7ba8281e05.zip gcc-601d22f69093aa98dcf9593bc138da7ba8281e05.tar.gz gcc-601d22f69093aa98dcf9593bc138da7ba8281e05.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/genmultilib | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a70b03d..d7b45ef 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 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 |