Patchwork [mips] add multiarch definitions for mips-linux-gnu

login
register
mail settings
Submitter Matthias Klose
Date Nov. 14, 2012, 10:33 p.m.
Message ID <50A41C33.6040509@ubuntu.com>
Download mbox | patch
Permalink /patch/199045/
State New
Headers show

Comments

Matthias Klose - Nov. 14, 2012, 10:33 p.m.
The following patch adds the multiarch definitions for mips-linux-gnu. Tested
using a Debian/Ubuntu package build. Ok for the trunk?

  Matthias
Richard Sandiford - Nov. 18, 2012, 10:46 a.m.
Matthias Klose <doko@ubuntu.com> writes:
> 2012-11-14  Matthias Klose  <doko@ubuntu.com>
>
> 	* config/mips/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.

OK, thanks.

Richard

Patch

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

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

Index: config/mips/t-linux64
===================================================================
--- config/mips/t-linux64	(revision 193508)
+++ config/mips/t-linux64	(working copy)
@@ -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))