t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.

2012-11-17  Matthias Klose  <doko@ubuntu.com>

        * config/mips/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.

From-SVN: r193598

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d4d54d4cf8d16f25c84d8eba144696d8b5006ba5..b6b063bf73a3cb7009855c602b2c0803a6a93f6a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-17  Matthias Klose  <doko@ubuntu.com>
+
+       * config/mips/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
+
 2012-11-17  Diego Novillo  <dnovillo@google.com>
 
        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 5197e5ee209285656da8fab91646cae4d828dcfb..20136cdbe9121960d8d42101e738ab0ae6879f60 100644 (file)
--- 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))