aboutsummaryrefslogtreecommitdiff
path: root/gcc/config/mips/t-img-linux
diff options
context:
space:
mode:
authorSteve Ellcey <sellcey@imgtec.com>2015-06-16 16:49:06 +0000
committerSteve Ellcey <sje@gcc.gnu.org>2015-06-16 16:49:06 +0000
commitc04f999f246342334940628a3d604666400fb8dd (patch)
tree2f503fd8e7c17e6fd0e31a974ef72acbc472eb2f /gcc/config/mips/t-img-linux
parent63d02f058f0ba3c1d00c2a9f12cac86eeec00b66 (diff)
downloadgcc-c04f999f246342334940628a3d604666400fb8dd.zip
gcc-c04f999f246342334940628a3d604666400fb8dd.tar.gz
gcc-c04f999f246342334940628a3d604666400fb8dd.tar.bz2
mti-linux.h (MIPS_SYSVERSION_SPEC): New.
2015-06-16 Steve Ellcey <sellcey@imgtec.com> * config/mips/mti-linux.h (MIPS_SYSVERSION_SPEC): New. (SYSROOT_SUFFIX_SPEC): Update. (SYSROOT_HEADERS_SUFFIX_SPEC): New. (STARTFILE_PREFIX_SPEC): Update. * config/mips/t-mti-linux (MULTILIB_EXCEPTIONS): Remove. (MULTILIB_REQUIRED): New. (MULTILIB_OSDIRNAMES): New. * config/mips/t-img-linux (MULTILIB_EXCEPTIONS): Remove. (MULTILIB_REQUIRED): New. (MULTILIB_OSDIRNAMES): New. From-SVN: r224525
Diffstat (limited to 'gcc/config/mips/t-img-linux')
-rw-r--r--gcc/config/mips/t-img-linux18
1 files changed, 13 insertions, 5 deletions
diff --git a/gcc/config/mips/t-img-linux b/gcc/config/mips/t-img-linux
index 86b0a26..93d81920 100644
--- a/gcc/config/mips/t-img-linux
+++ b/gcc/config/mips/t-img-linux
@@ -23,8 +23,16 @@ MULTILIB_OPTIONS = mips64r6 mabi=64 EL
MULTILIB_DIRNAMES = mips64r6 64 el
MULTILIB_MATCHES = EL=mel EB=meb
-# The 64 bit ABI is not supported on the mips32r6 architecture.
-# Because mips32r6 is the default we can't use that flag to trigger
-# the exception so we check for mabi=64 with no specific mips
-# architecture flag instead.
-MULTILIB_EXCEPTIONS += mabi=64*
+MULTILIB_REQUIRED =
+MULTILIB_OSDIRNAMES = .=mips-r6-hard/lib
+MULTILIB_REQUIRED += mips64r6
+MULTILIB_OSDIRNAMES += mips64r6=!mips-r6-hard/lib32
+MULTILIB_REQUIRED += mips64r6/mabi=64
+MULTILIB_OSDIRNAMES += mips64r6/mabi.64=!mips-r6-hard/lib64
+
+MULTILIB_REQUIRED += EL
+MULTILIB_OSDIRNAMES += EL=!mipsel-r6-hard/lib
+MULTILIB_REQUIRED += mips64r6/EL
+MULTILIB_OSDIRNAMES += mips64r6/EL=!mipsel-r6-hard/lib32
+MULTILIB_REQUIRED += mips64r6/mabi=64/EL
+MULTILIB_OSDIRNAMES += mips64r6/mabi.64/EL=!mipsel-r6-hard/lib64