Bug#695661: #695661: gcc-4.7: Please fix build on powerpcspe
Hi,
in short: The new patches you proposed work (as attached for the current
versions in unstable and experimental, resp.)! :-)
Now, we can support powerpc, powerpcspe and spev1, even fixing the bsd
specific stuff (t-spe) upstream.
Thanks,
Roland
--- debian/patches/gcc-multiarch.diff.orig 2012-12-15 01:56:47.689469128 +0100
+++ debian/patches/gcc-multiarch.diff 2012-12-15 02:11:14.177493559 +0100
@@ -555,7 +564,7 @@
maltivec/mlittle \
maltivec/mabi=altivec/mlittle
+
-+MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file)),,v1)
++MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file_list)),,v1)
+
--- a/src/gcc/config/rs6000/t-linux64 (revision 182390)
+++ b/src/gcc/config/rs6000/t-linux64 (working copy)
@@ -570,8 +579,12 @@
MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
--- a/src/gcc/config/rs6000/t-linux (revision 0)
+++ b/src/gcc/config/rs6000/t-linux (revision 0)
-@@ -0,0 +1 @@
+@@ -0,0 +1,5 @@
++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
--- a/src/gcc/config/arm/t-linux-eabi (revision 182390)
+++ b/src/gcc/config/arm/t-linux-eabi (working copy)
@@ -24,3 +24,6 @@
--- debian/patches/gcc-multiarch-upstream.diff.orig 2012-12-18 10:52:15.000000000 +0100
+++ debian/patches/gcc-multiarch-upstream.diff 2012-12-18 10:54:23.000000000 +0100
@@ -347,12 +347,16 @@
+MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
--- a/src/gcc/config/rs6000/t-linux (Revision 0)
+++ b/src/gcc/config/rs6000/t-linux (Arbeitskopie)
-@@ -0,0 +1,5 @@
+@@ -0,0 +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
--- a/src/gcc/config/rs6000/t-spe (Revision 193696)
+++ b/src/gcc/config/rs6000/t-spe (Arbeitskopie)
@@ -71,3 +71,7 @@
@@ -361,7 +365,7 @@
maltivec/mabi=altivec/mlittle
+
+ifneq (,$(findstring linux, $(target)))
-+MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file)),,v1)
++MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file_list)),,v1)
+endif
--- a/src/gcc/config/rs6000/t-fprules (Revision 193696)
+++ b/src/gcc/config/rs6000/t-fprules (Arbeitskopie)
Reply to: