diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-11-18 13:37:05 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2012-11-18 13:37:05 +0000 |
| commit | 3808f68ef811f22a3fd2dc0c8507b9b3e3dadb4e (patch) | |
| tree | f5c7989862cea370e925c51faa4cf43febe10feb /gcc | |
| parent | b16b6cc91379e6e4088f9da3eb5e98f7080384c8 (diff) | |
| download | gcc-3808f68ef811f22a3fd2dc0c8507b9b3e3dadb4e.zip gcc-3808f68ef811f22a3fd2dc0c8507b9b3e3dadb4e.tar.gz gcc-3808f68ef811f22a3fd2dc0c8507b9b3e3dadb4e.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/mips/t-linux64 | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d4d54d4..b6b063b 100644 --- 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 5197e5e..20136cd 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)) |