From patchwork Wed Nov 14 23:33:32 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [m68k] add multiarch definitions for m68k-linux-gnu
Date: Wed, 14 Nov 2012 13:33:32 -0000
From: Matthias Klose <doko@ubuntu.com>
X-Patchwork-Id: 199076
Message-Id: <50A42A4C.6010706@ubuntu.com>
To: "Joseph S. Myers" <joseph@codesourcery.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>,  Thorsten Glaser <tg@debian.org>

Am 14.11.2012 23:39, schrieb Joseph S. Myers:
> On Wed, 14 Nov 2012, Matthias Klose wrote:
> 
>> The following patch adds the multiarch definitions for m68k-linux-gnu. Tested
>> using a Debian/Ubuntu package build. Ok for the trunk?
>>
>> Here, I'm unsure if the definition needs to be further constrained.
> 
> Classix m68k and ColdFire need different multiarch names; you need to 
> avoid using a name for one on a compiler configured for the other.  (I 
> think any configuration will always be --with-arch=m68k or --with-arch=cf 
> so you should only need to consider M68K_ARCH rather than having 
> per-multilib settings.)

thanks for the pointer. For now, I set it just for the classic m68k.

  Matthias


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

	* config/m68k/t-linux: Define MULTIARCH_DIRNAME for classic m68k.

Index: config/m68k/t-linux
===================================================================
--- config/m68k/t-linux	(revision 193510)
+++ config/m68k/t-linux	(working copy)
@@ -19,6 +19,10 @@
 # Only include multilibs for 680x0 and ColdFire CPUs with an MMU.
 M68K_MLIB_CPU += && ((CPU ~ "^m680") || (CPU ~ "^mcf")) && (FLAGS ~ "FL_MMU")
 
+ifeq ($(M68K_ARCH),m68k)
+MULTIARCH_DIRNAME = $(call if_multiarch,m68k-linux-gnu)
+endif
+
 # This rule uses MULTILIB_MATCHES to generate a definition of
 # SYSROOT_SUFFIX_SPEC.
 sysroot-suffix.h: $(srcdir)/config/m68k/print-sysroot-suffix.sh