diff options
| author | Matthias Klose <doko@debian.org> | 2011-08-22 11:21:55 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2011-08-22 11:21:55 +0000 |
| commit | 1ad1ae8093623752cd72c2cf0df3895cea31675e (patch) | |
| tree | 0b9a1b7a8375a11a57f6ec4320e66b7b895ab628 /gcc | |
| parent | ed90b6734c14338e3a9cd2c3b343d61c2c757827 (diff) | |
| download | gcc-1ad1ae8093623752cd72c2cf0df3895cea31675e.zip gcc-1ad1ae8093623752cd72c2cf0df3895cea31675e.tar.gz gcc-1ad1ae8093623752cd72c2cf0df3895cea31675e.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/config.gcc | 1 | ||||
| -rw-r--r-- | gcc/config/mips/t-linux64 | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4793d03..76154f2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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> PR bootstrap/50146 diff --git a/gcc/config.gcc b/gcc/config.gcc index 7f29213..e8e0eeb 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1854,7 +1854,6 @@ mips*-*-linux*) # Linux MIPS, either endian. if test x$enable_targets = xall; then tm_file="${tm_file} mips/gnu-user64.h mips/linux64.h" tmake_file="${tmake_file} mips/t-linux64" - tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32" fi case ${target} in mipsisa32r2*) diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 index e23743d..0e69517 100644 --- a/gcc/config/mips/t-linux64 +++ b/gcc/config/mips/t-linux64 @@ -17,11 +17,7 @@ # <http://www.gnu.org/licenses/>. 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 -endif MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o |