Patchwork fix multiarch definition for powerpcspe-linux-gnu

login
register
mail settings
Submitter Matthias Klose
Date Dec. 19, 2012, 4:47 p.m.
Message ID <50D1EF8D.5050702@ubuntu.com>
Download mbox | patch
Permalink /patch/207458/
State New
Headers show

Comments

Matthias Klose - Dec. 19, 2012, 4:47 p.m.
The definition of the multiarch tuple for powerpcspe-linux-gnu was wrong. The
t-spe fragment isn't included for the powerpc*-linux* case, so move it to
t-linux, and use tm_file_list (tm_file is only used in config.gcc).

Ok for the trunk?

  Matthias
David Edelsohn - Dec. 20, 2012, 4:28 a.m.
On Wed, Dec 19, 2012 at 11:47 AM, Matthias Klose <doko@ubuntu.com> wrote:
> The definition of the multiarch tuple for powerpcspe-linux-gnu was wrong. The
> t-spe fragment isn't included for the powerpc*-linux* case, so move it to
> t-linux, and use tm_file_list (tm_file is only used in config.gcc).
>
> Ok for the trunk?

Okay.

Thanks, David

Patch

2012-12-19  Roland Stigge  <stigge@debian.org>
	    Matthias Klose  <doko@ubuntu.com>

	* config/rs6000/t-spe (MULTIARCH_DIRNAME): Remove.
	* config/rs6000/t-linux (MULTIARCH_DIRNAME): Define name for
	powerpc-linux-gnuspe.

Index: config/rs6000/t-spe
===================================================================
--- config/rs6000/t-spe	(Revision 194615)
+++ config/rs6000/t-spe	(Arbeitskopie)
@@ -71,7 +71,3 @@ 
 			  mabi=altivec/mlittle \
 			  maltivec/mlittle \
 			  maltivec/mabi=altivec/mlittle
-
-ifneq (,$(findstring linux, $(target)))
-MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file)),,v1)
-endif
Index: config/rs6000/t-linux
===================================================================
--- config/rs6000/t-linux	(Revision 194615)
+++ config/rs6000/t-linux	(Arbeitskopie)
@@ -1,5 +1,9 @@ 
 # do not define the multiarch name if configured for a soft-float cpu
 # or soft-float.
 ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
+ifneq (,$(findstring spe,$(target)))
+MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file_list)),,v1)
+else
 MULTIARCH_DIRNAME = powerpc-linux-gnu
 endif
+endif