From 0630b8ec3d991a3a7bbd1e041a167a1424c1d388 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Wed, 24 Aug 2016 09:51:35 +0000 Subject: [PATCH] fragments.texi (MULTILIB_REUSE): Mention that only options in MULTILIB_OPTIONS should be used. 2016-08-24 Thomas Preud'homme * doc/fragments.texi (MULTILIB_REUSE): Mention that only options in MULTILIB_OPTIONS should be used. Small wording fixes. * genmultilib: Memorize set of all option combinations in combination_space. Detect if RHS of MULTILIB_REUSE uses an option not found in MULTILIB_OPTIONS by checking if option set is listed in combination_space. Output new and existing error message to stderr. From-SVN: r239734 --- gcc/ChangeLog | 9 +++++++++ gcc/doc/fragments.texi | 19 ++++++++++--------- gcc/genmultilib | 22 ++++++++++++++-------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b2a67b3d530..8d104ec8f28 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2016-08-24 Thomas Preud'homme + + * doc/fragments.texi (MULTILIB_REUSE): Mention that only options in + MULTILIB_OPTIONS should be used. Small wording fixes. + * genmultilib: Memorize set of all option combinations in + combination_space. Detect if RHS of MULTILIB_REUSE uses an option not + found in MULTILIB_OPTIONS by checking if option set is listed in + combination_space. Output new and existing error message to stderr. + 2016-08-24 Thomas Preud'homme * config/arm/t-aprofile (MULTILIB_MATCHES): Add mapping for diff --git a/gcc/doc/fragments.texi b/gcc/doc/fragments.texi index f4e6636fb95..f5d8e8d6890 100644 --- a/gcc/doc/fragments.texi +++ b/gcc/doc/fragments.texi @@ -156,15 +156,16 @@ variants. And for some targets it is better to reuse an existing multilib than to fall back to default multilib when there is no corresponding multilib. This can be done by adding reuse rules to @code{MULTILIB_REUSE}. -A reuse rule is comprised of two parts connected by equality sign. The left part -is option set used to build multilib and the right part is option set that will -reuse this multilib. The order of options in the left part matters and should be -same with those specified in @code{MULTILIB_REQUIRED} or aligned with order in -@code{MULTILIB_OPTIONS}. There is no such limitation for options in right part -as we don't build multilib from them. But the equality sign in both parts should -be replaced with period. - -The @code{MULTILIB_REUSE} is different from @code{MULTILIB_MATCHES} in that it +A reuse rule is comprised of two parts connected by equality sign. The left +part is the option set used to build multilib and the right part is the option +set that will reuse this multilib. Both parts should only use options +specified in @code{MULTILIB_OPTIONS} and the equality signs found in options +name should be replaced with periods. The order of options in the left part +matters and should be same with those specified in @code{MULTILIB_REQUIRED} or +aligned with the order in @code{MULTILIB_OPTIONS}. There is no such limitation +for options in the right part as we don't build multilib from them. + +@code{MULTILIB_REUSE} is different from @code{MULTILIB_MATCHES} in that it sets up relations between two option sets rather than two options. Here is an example to demo how we reuse libraries built in Thumb mode for applications built in ARM mode: diff --git a/gcc/genmultilib b/gcc/genmultilib index 083259aa82c..eb5f661a5fd 100644 --- a/gcc/genmultilib +++ b/gcc/genmultilib @@ -186,7 +186,8 @@ fi EOF chmod +x tmpmultilib -combinations=`initial=/ ./tmpmultilib ${options}` +combination_space=`initial=/ ./tmpmultilib ${options}` +combinations="$combination_space" # If there exceptions, weed them out now if [ -n "${exceptions}" ]; then @@ -472,14 +473,19 @@ for rrule in ${multilib_reuse}; do # in this variable, it means no multilib will be built for current reuse # rule. Thus the reuse purpose specified by current rule is meaningless. if expr "${combinations} " : ".*/${combo}/.*" > /dev/null; then - combo="/${combo}/" - dirout=`./tmpmultilib3 "${combo}" "${todirnames}" "${toosdirnames}" "${enable_multilib}"` - copts="/${copts}/" - optout=`./tmpmultilib4 "${copts}" "${options}"` - # Output the line with all appropriate matches. - dirout="${dirout}" optout="${optout}" ./tmpmultilib2 + if expr "${combination_space} " : ".*/${copts}/.*" > /dev/null; then + combo="/${combo}/" + dirout=`./tmpmultilib3 "${combo}" "${todirnames}" "${toosdirnames}" "${enable_multilib}"` + copts="/${copts}/" + optout=`./tmpmultilib4 "${copts}" "${options}"` + # Output the line with all appropriate matches. + dirout="${dirout}" optout="${optout}" ./tmpmultilib2 + else + echo "The rule ${rrule} contains an option absent from MULTILIB_OPTIONS." >&2 + exit 1 + fi else - echo "The rule ${rrule} is trying to reuse nonexistent multilib." + echo "The rule ${rrule} is trying to reuse nonexistent multilib." >&2 exit 1 fi done -- 2.30.2