1 --- a/src/libFLAC/Makefile.in
2 +++ b/src/libFLAC/Makefile.in
3 @@ -66,6 +66,7 @@ NORMAL_UNINSTALL = :
7 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@@FLaC__USE_ALTIVEC_TRUE@am__append_1 = -maltivec -mabi=altivec
9 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
10 AMDEP_FALSE = @AMDEP_FALSE@
11 @@ -234,13 +235,21 @@ target_alias = @target_alias@
13 lib_LTLIBRARIES = libFLAC.la
14 @DEBUG_TRUE@DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
15 +# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
16 +#@@@ PPC optimizations temporarily disabled
17 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = \
18 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@ $(am__append_1) \
19 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@ -DFLAC__NO_ASM
21 +# FIXME: The following logic should be part of configure, not of Makefile.am
23 # The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
24 # into cpu.c with an asm().
25 #@@@ PPC optimizations temporarily disabled
26 -@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
27 -# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
28 -#@@@ PPC optimizations temporarily disabled
29 -@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
30 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec \
31 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ -force_cpusubtype_ALL \
32 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ -DFLAC__NO_ASM \
33 +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ $(am__append_1)
35 AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@
36 @FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE@ARCH_SUBDIRS = ppc
37 --- a/src/libFLAC/Makefile.am
38 +++ b/src/libFLAC/Makefile.am
39 @@ -32,6 +32,9 @@ lib_LTLIBRARIES = libFLAC.la
41 DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
44 +# FIXME: The following logic should be part of configure, not of Makefile.am
47 # The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
48 # into cpu.c with an asm().
49 @@ -40,8 +43,12 @@ if FLaC__SYS_DARWIN
50 CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
52 # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
55 +CPUCFLAGS += -maltivec -mabi=altivec
57 #@@@ PPC optimizations temporarily disabled
58 -CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
59 +CPUCFLAGS += -DFLAC__NO_ASM