From 3808f68ef811f22a3fd2dc0c8507b9b3e3dadb4e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 18 Nov 2012 13:37:05 +0000 Subject: [PATCH] t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. 2012-11-17 Matthias Klose * config/mips/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. From-SVN: r193598 --- gcc/ChangeLog | 4 ++++ gcc/config/mips/t-linux64 | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d4d54d4cf8d..b6b063bf73a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-11-17 Matthias Klose + + * config/mips/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. + 2012-11-17 Diego Novillo VEC API overhaul (http://gcc.gnu.org/wiki/cxx-conversion/cxx-vec) diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 index 5197e5ee209..20136cdbe91 100644 --- a/gcc/config/mips/t-linux64 +++ b/gcc/config/mips/t-linux64 @@ -18,4 +18,9 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_DIRNAMES = n32 32 64 -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 +MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) +MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) +MULTILIB_OSDIRNAMES = \ + ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ + ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ + ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) -- 2.30.2