576764 - incorrect #define for PowerPC in mozilla-central/gfx/ycbcr/chromium_types.h

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Nic Soudée]

User-Agent:       Mozilla/5.0 (X11; Linux ppc; en-US; rv:2.0b2pre) Gecko/20100703
Build Identifier: Mozilla/5.0 (X11; Linux ppc; en-US; rv:2.0b2pre) Gecko/20100703

I'm running Debian testing on an iBook G4, and I build my own minefield on a regular basis so that sound works. For the past few weeks I have been unable to compile it and figured someone would eventually fix the problem. Since today is a long weekend I decided to actually try diagnosing the problem and figured out what's wrong: The #define being checked against for PowerPC does not match up the one for my GCC (gcc (Debian 4.4.4-5) 4.4.4). The file mozilla-central/gfx/ycbcr/chromium_types.h currently checks against "__ppc__" but my GCC has "__PPC__" (uppercase), "__PPC", "__ARCH_PPC" and "__powerpc". I have changed the "__ppc__" to "__powerpc" and everything built fine.

Reproducible: Always

Steps to Reproduce:
1. Try to build firefox
2. Get error about platform not being in chromium_types.h
3. Sad face
Actual Results:  
Build error

Expected Results:  
Build Success

Used "__PPC__" or "__powerpc" as the #define variable instead of, or complementary with, "__ppc__".

Comment 1

[(not currently active) Ted Mielczarek]

I suspect this code probably only cares about OS X/PPC, not Linux/PPC.

Comment 2

[(not currently active) Ted Mielczarek]

Oops, I saw chromium_types and missed the rest of the path. :)

Comment 3

[Douglas]

(In reply to comment #0)

> The file
> mozilla-central/gfx/ycbcr/chromium_types.h 
> currently checks against "__ppc__" but my GCC has "__PPC__" (uppercase),
> "__PPC", "__ARCH_PPC" and "__powerpc". I have changed the "__ppc__" 
> to "__powerpc" and everything built fine.

Here's the patch to fix that chromium_types.h header file:

--- ./gfx/ycbcr/chromium_types.h	2010-10-09 13:40:21.563086014 +0200
+++ ./gfx/ycbcr/chromium_types.h	2010-10-09 13:39:27.832088583 +0200
@@ -60,7 +60,7 @@
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARMEL 1
 #define ARCH_CPU_32_BITS 1
-#elif defined(__ppc__)
+#elif defined(__powerpc) || defined(__PPC__) || defined(__ppc__)
 #define ARCH_CPU_PPC_FAMILY 1
 #define ARCH_CPU_PPC 1
 #define ARCH_CPU_32_BITS 1

(It can be applied via 'patch -p1 < PATCH-chromium_types_h'.)

Comment 4

[Douglas]

Attachment: A simple patch to fix build issue with firefox 4.0b

Comment 5

[cajbir (:cajbir)]

Thanks for the patch. Bug 583138 updates to the latest chromium code and I've blocked that on this one to ensure I get this fix into it as part of the update.

Comment 6

[cajbir (:cajbir)]

Fixed in bug 583138 which has now landed. Thanks for the patch!