Commit ec6be462 by Thomas Preud'homme Committed by Thomas Preud'homme

config.gcc: Error out when conflicting multilib is detected.

2016-05-04  Thomas Preud'homme  <thomas.preudhomme@arm.com>

    gcc/
    * config.gcc: Error out when conflicting multilib is detected.  Do not
    loop over multilibs since no combination is legal.

From-SVN: r235877
parent 24f77f59
2016-05-04 Thomas Preud'homme <thomas.preudhomme@arm.com>
* config.gcc: Error out when conflicting multilib is detected. Do not
loop over multilibs since no combination is legal.
2016-05-04 Alan Modra <amodra@gmail.com> 2016-05-04 Alan Modra <amodra@gmail.com>
* config/rs6000/rs6000.h (PIC_OFFSET_TABLE_REGNUM): Correct. * config/rs6000/rs6000.h (PIC_OFFSET_TABLE_REGNUM): Correct.
......
...@@ -3765,38 +3765,40 @@ case "${target}" in ...@@ -3765,38 +3765,40 @@ case "${target}" in
# Add extra multilibs # Add extra multilibs
if test "x$with_multilib_list" != x; then if test "x$with_multilib_list" != x; then
arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'` arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'`
for arm_multilib in ${arm_multilibs}; do case ${arm_multilibs} in
case ${arm_multilib} in aprofile)
aprofile)
# Note that arm/t-aprofile is a # Note that arm/t-aprofile is a
# stand-alone make file fragment to be # stand-alone make file fragment to be
# used only with itself. We do not # used only with itself. We do not
# specifically use the # specifically use the
# TM_MULTILIB_OPTION framework because # TM_MULTILIB_OPTION framework because
# this shorthand is more # this shorthand is more
# pragmatic. Additionally it is only # pragmatic.
# designed to work without any tmake_profile_file="arm/t-aprofile"
# with-cpu, with-arch with-mode ;;
default)
;;
*)
echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
exit 1
;;
esac
if test "x${tmake_profile_file}" != x ; then
# arm/t-aprofile is only designed to work
# without any with-cpu, with-arch, with-mode,
# with-fpu or with-float options. # with-fpu or with-float options.
if test "x$with_arch" != x \ if test "x$with_arch" != x \
|| test "x$with_cpu" != x \ || test "x$with_cpu" != x \
|| test "x$with_float" != x \ || test "x$with_float" != x \
|| test "x$with_fpu" != x \ || test "x$with_fpu" != x \
|| test "x$with_mode" != x ; then || test "x$with_mode" != x ; then
echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=aprofile" 1>&2 echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=${with_multilib_list}" 1>&2
exit 1 exit 1
fi fi
tmake_file="${tmake_file} arm/t-aprofile"
break tmake_file="${tmake_file} ${tmake_profile_file}"
;; fi
default)
;;
*)
echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
exit 1
;;
esac
done
fi fi
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment