git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert: t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if tm_defines contains MIPS_ABI_DEFAULT ABI_32... 

2011-08-22  Matthias Klose <doko@debian.org>

        Revert:
        2011-07-11  Arthur Loiret  <aloiret@debian.org>
                    Matthias Klose <doko@debian.org>
        * config/mips/t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if
        tm_defines contains MIPS_ABI_DEFAULT ABI_32, to follow the glibc
        convention.
        * config.gcc (tm_defines): Add MIPS_ABI_DEFAULT=ABI_32.

From-SVN: r177953
This commit is contained in:
Matthias Klose 2011-08-22 11:21:55 +00:00 committed by Matthias Klose
parent ed90b6734c
commit 1ad1ae8093
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2011-08-22 Matthias Klose <doko@debian.org>
Revert:
2011-07-11 Arthur Loiret <aloiret@debian.org>
Matthias Klose <doko@debian.org>
* config/mips/t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if
tm_defines contains MIPS_ABI_DEFAULT ABI_32, to follow the glibc
convention.
* config.gcc (tm_defines): Add MIPS_ABI_DEFAULT=ABI_32.
2011-08-22 Mikael Pettersson <mikpe@it.uu.se> 2011-08-22 Mikael Pettersson <mikpe@it.uu.se>
PR bootstrap/50146 PR bootstrap/50146

1
gcc/config.gcc
View File

@ -1854,7 +1854,6 @@ mips*-*-linux*) # Linux MIPS, either endian.
if test x$enable_targets = xall; then if test x$enable_targets = xall; then
tm_file="${tm_file} mips/gnu-user64.h mips/linux64.h" tm_file="${tm_file} mips/gnu-user64.h mips/linux64.h"
tmake_file="${tmake_file} mips/t-linux64" tmake_file="${tmake_file} mips/t-linux64"
tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32"
fi fi
case ${target} in case ${target} in
mipsisa32r2*) mipsisa32r2*)

4
gcc/config/mips/t-linux64
View File

@ -17,11 +17,7 @@
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
ifneq ($(filter MIPS_ABI_DEFAULT=ABI_32,$(tm_defines)),)
MULTILIB_DIRNAMES = n32 . 64
else
MULTILIB_DIRNAMES = n32 32 64 MULTILIB_DIRNAMES = n32 32 64
endif
MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o