On 08/02/2016 10:32 AM, John Paul Adrian Glaubitz wrote:
> Adding the latest version of the Debian patch which I am going to test now.
> 
> Will report back in a few hours, hopefully.

Ok, there were two more problems with the patch which I have fixed now. The
build almost finishes now but it xpcshell, hence JavaScript is crashing
in the end, but that is most likely a different problem.

In any case, this particular patch has been verified to do the right
thing, please apply it in its currently attached version.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
From: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
Date: Sun, 31 Jul 2016 13:20:50 +0200
Subject: Don't try to build with Altivec support on powerpcspe

Closes: #732368
https://bugzilla.mozilla.org/show_bug.cgi?id=972945
---
Index: firefox-47.0.1/gfx/qcms/moz.build
===================================================================
--- firefox-47.0.1.orig/gfx/qcms/moz.build
+++ firefox-47.0.1/gfx/qcms/moz.build
@@ -32,9 +32,8 @@ if '86' in CONFIG['OS_TEST']:
             use_sse1 = True
     else:
         use_sse1 = True
-elif 'ppc' in CONFIG['CPU_ARCH']:
-    if CONFIG['GNU_CC']:
-        use_altivec = True
+elif CONFIG['HAVE_ALTIVEC']:
+    use_altivec = True
 
 if use_sse1:
     SOURCES += ['transform-sse1.c']
Index: firefox-47.0.1/gfx/qcms/transform.c
===================================================================
--- firefox-47.0.1.orig/gfx/qcms/transform.c
+++ firefox-47.0.1/gfx/qcms/transform.c
@@ -1296,7 +1296,7 @@ qcms_transform* qcms_transform_create(
 #endif
 		    } else
 #endif
-#if (defined(__POWERPC__) || defined(__powerpc__))
+#if (defined(__POWERPC__) || defined(__powerpc__) && !defined(__NO_FPRS__))
 		    if (have_altivec()) {
 			    if (in_type == QCMS_DATA_RGB_8)
 				    transform->transform_fn = qcms_transform_data_rgb_out_lut_altivec;
Index: firefox-47.0.1/old-configure.in
===================================================================
--- firefox-47.0.1.orig/old-configure.in
+++ firefox-47.0.1/old-configure.in
@@ -1116,6 +1116,9 @@ powerpc64 | ppc64 | powerpc64le | ppc64l
     ;;
 
 powerpc | ppc | rs6000)
+    if test "$GNU_CC" && test -z "$(echo | $CC -x c -c -maltivec - 2>&1)" ; then
+        HAVE_ALTIVEC=1
+    fi
     CPU_ARCH=ppc
     ;;
 
@@ -8817,6 +8820,7 @@ AC_SUBST(INTEL_ARCHITECTURE)
 AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3)
 AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1)
 AC_SUBST(HAVE_X86_AVX2)
+AC_SUBST(HAVE_ALTIVEC)
 AC_SUBST(GCC_USE_GNU_LD)
 
 AC_SUBST(MOZ_CHROME_FILE_FORMAT)

Reply via email to