|
@@ -0,0 +1,62 @@
|
|
1
|
+--- a/src/libFLAC/Makefile.in
|
|
2
|
++++ b/src/libFLAC/Makefile.in
|
|
3
|
+@@ -66,6 +66,7 @@ NORMAL_UNINSTALL = :
|
|
4
|
+ PRE_UNINSTALL = :
|
|
5
|
+ POST_UNINSTALL = :
|
|
6
|
+ host_triplet = @host@
|
|
7
|
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@@FLaC__USE_ALTIVEC_TRUE@am__append_1 = -maltivec -mabi=altivec
|
|
8
|
+ ACLOCAL = @ACLOCAL@
|
|
9
|
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
|
10
|
+ AMDEP_FALSE = @AMDEP_FALSE@
|
|
11
|
+@@ -234,13 +235,21 @@ target_alias = @target_alias@
|
|
12
|
+
|
|
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
|
|
20
|
++
|
|
21
|
++# FIXME: The following logic should be part of configure, not of Makefile.am
|
|
22
|
++
|
|
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)
|
|
34
|
+
|
|
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
|
|
40
|
+ if DEBUG
|
|
41
|
+ DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
|
|
42
|
+ endif
|
|
43
|
++
|
|
44
|
++# FIXME: The following logic should be part of configure, not of Makefile.am
|
|
45
|
++
|
|
46
|
+ if FLaC__CPU_PPC
|
|
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
|
|
51
|
+ else
|
|
52
|
+ # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
|
|
53
|
++CPUCFLAGS =
|
|
54
|
++if FLaC__USE_ALTIVEC
|
|
55
|
++CPUCFLAGS += -maltivec -mabi=altivec
|
|
56
|
++endif
|
|
57
|
+ #@@@ PPC optimizations temporarily disabled
|
|
58
|
+-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
|
|
59
|
++CPUCFLAGS += -DFLAC__NO_ASM
|
|
60
|
+ endif
|
|
61
|
+ endif
|
|
62
|
+
|