Message ID | 20120604180936.GA5993@intel.com |
---|---|
State | New |
Headers | show |
On Mon, Jun 4, 2012 at 8:09 PM, H.J. Lu <hongjiu.lu@intel.com> wrote: > We should enable x32 run-time library if --with-abi={x32|mx32} is used > to configure GCC i[34567]86-*-* and x86_64-*-*. Tested on Linux/x86-64. > OK for trunk? > > 2012-06-04 H.J. Lu <hongjiu.lu@intel.com> > > PR target/53575 > * config.gcc: Enable x32 run-time library if --with-abi={x32|mx32} > is used for i[34567]86-*-* and x86_64-*-*. > > diff --git a/gcc/config.gcc b/gcc/config.gcc > index 61adc89..3f66bd2 100644 > --- a/gcc/config.gcc > +++ b/gcc/config.gcc > @@ -1233,7 +1233,14 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i > tmake_file="${tmake_file} i386/t-linux64" > x86_multilibs="${with_multilib_list}" > if test "$x86_multilibs" = "default"; then > - x86_multilibs="m64,m32" > + case ${with_abi} in > + x32 | mx32) > + x86_multilibs="m64,m32,mx32" Why all three ABIs here? Didn't user specify -with-abi=mx32 only, so x86_multilibs="mx32" only here. Uros.
diff --git a/gcc/config.gcc b/gcc/config.gcc index 61adc89..3f66bd2 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1233,7 +1233,14 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i tmake_file="${tmake_file} i386/t-linux64" x86_multilibs="${with_multilib_list}" if test "$x86_multilibs" = "default"; then - x86_multilibs="m64,m32" + case ${with_abi} in + x32 | mx32) + x86_multilibs="m64,m32,mx32" + ;; + *) + x86_multilibs="m64,m32" + ;; + esac fi x86_multilibs=`echo $x86_multilibs | sed -e 's/,/ /g'` for x86_multilib in ${x86_multilibs}; do @@ -1299,7 +1306,14 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) tmake_file="${tmake_file} i386/t-linux64" x86_multilibs="${with_multilib_list}" if test "$x86_multilibs" = "default"; then - x86_multilibs="m64,m32" + case ${with_abi} in + x32 | mx32) + x86_multilibs="m64,m32,mx32" + ;; + *) + x86_multilibs="m64,m32" + ;; + esac fi x86_multilibs=`echo $x86_multilibs | sed -e 's/,/ /g'` for x86_multilib in ${x86_multilibs}; do