From c04f999f246342334940628a3d604666400fb8dd Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Tue, 16 Jun 2015 16:49:06 +0000 Subject: mti-linux.h (MIPS_SYSVERSION_SPEC): New. 2015-06-16 Steve Ellcey * 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 --- gcc/config/mips/mti-linux.h | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'gcc/config/mips/mti-linux.h') diff --git a/gcc/config/mips/mti-linux.h b/gcc/config/mips/mti-linux.h index 80d5925..03d1baa 100644 --- a/gcc/config/mips/mti-linux.h +++ b/gcc/config/mips/mti-linux.h @@ -18,16 +18,23 @@ along with GCC; see the file COPYING3. If not see . */ /* This target is a multilib target, specify the sysroot paths. */ +#define MIPS_SYSVERSION_SPEC \ + "%{mips32:r1}%{mips64:r1}%{mips32r2:r2}%{mips64r2:r2}" \ + "%{mips32r6:r6}%{mips64r6:r6}%{mips16:-mips16}" + #undef SYSROOT_SUFFIX_SPEC -#if MIPS_ISA_DEFAULT == 33 /* mips32r2 is the default */ -#define SYSROOT_SUFFIX_SPEC \ - "%{mips32:/mips32}%{mips64:/mips64}%{mips64r2:/mips64r2}%{mips32r6:/mips32r6}%{mips64r6:/mips64r6}%{mips16:/mips16}%{mmicromips:/micromips}%{mabi=64:/64}%{mel|EL:/el}%{msoft-float:/sof}%{!mips32r6:%{!mips64r6:%{mnan=2008:/nan2008}}}" -#elif MIPS_ISA_DEFAULT == 37 /* mips32r6 is the default */ -#define SYSROOT_SUFFIX_SPEC \ - "%{mips32:/mips32}%{mips64:/mips64}%{mips32r2:/mips32r2}%{mips64r2:/mips64r2}%{mips64r6:/mips64r6}%{mips16:/mips16}%{mmicromips:/micromips}%{mabi=64:/64}%{mel|EL:/el}%{msoft-float:/sof}%{!mips32r6:%{!mips64r6:%{mnan=2008:/nan2008}}}" -#else /* Unexpected default ISA. */ -#error No SYSROOT_SUFFIX_SPEC exists for this default ISA -#endif +#define SYSROOT_SUFFIX_SPEC \ + "/%{mmicromips:micro}mips%{mel|EL:el}-"MIPS_SYSVERSION_SPEC \ + "%{msoft-float:-soft;:-hard}" \ + "%{!mips32r6:%{!mips64r6:%{mnan=2008:-nan2008}}}%{muclibc:-uclibc}" + +#define SYSROOT_HEADERS_SUFFIX_SPEC SYSROOT_SUFFIX_SPEC + +#undef STARTFILE_PREFIX_SPEC +#define STARTFILE_PREFIX_SPEC \ + "%{mabi=32: /usr/local/lib/ /lib/ /usr/lib/} \ + %{mabi=n32: /usr/local/lib32/ /lib32/ /usr/lib32/} \ + %{mabi=64: /usr/local/lib64/ /lib64/ /usr/lib64/}" #undef DRIVER_SELF_SPECS #define DRIVER_SELF_SPECS \ -- cgit v1.1