summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch')
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch78
1 files changed, 0 insertions, 78 deletions
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch b/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
deleted file mode 100644
index 5ca8b35142..0000000000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3From f9b017c2c958d968cc5dfd36dc68fc8e5fb89a58 Mon Sep 17 00:00:00 2001
4From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
5Date: Fri, 11 Jun 2010 09:48:58 +0200
6Subject: [PATCH] No AltiVec on SPE
7
8Consider *gnuspe which matches powerpc-unknown-linux-gnuspe where
9AltiVec is not available at all. This triplet uses SPE which is
10incompatible with AltiVec shares the same opcode range and can't be used
11at all.
12
13Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
14---
15 configure.in | 8 ++++++++
16 src/libFLAC/Makefile.am | 10 +++++++++-
17 2 files changed, 17 insertions(+), 1 deletions(-)
18
19diff --git a/configure.in b/configure.in
20index bfa6d8e..17b7c73 100644
21--- a/configure.in
22+++ b/configure.in
23@@ -82,6 +82,14 @@ case "$host" in
24 *) OBJ_FORMAT=elf ;;
25 esac
26 AC_SUBST(OBJ_FORMAT)
27+case "$host" in
28+ *-gnuspe)
29+ abi_spe=true
30+ AC_DEFINE(FLAC__CPU_PPC_SPE)
31+ AH_TEMPLATE(FLAC__CPU_PPC_SPE, [define if building for PowerPC with SPE ABI])
32+ ;;
33+esac
34+AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test "x$abi_spe" = xtrue)
35
36 # only needed because of ntohl() usage, can get rid of after that's gone:
37 case "$host" in
38diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
39index cbfb0ac..5785372 100644
40--- a/src/libFLAC/Makefile.am
41+++ b/src/libFLAC/Makefile.am
42@@ -40,8 +40,15 @@ if FLaC__SYS_DARWIN
43 CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
44 else
45 # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
46+CPUCFLAGS =
47+if FLaC__CPU_PPC_SPE
48+else
49+if FLaC__USE_ALTIVEC
50+CPUCFLAGS += -maltivec -mabi=altivec
51+endif
52+endif
53 #@@@ PPC optimizations temporarily disabled
54-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
55+CPUCFLAGS += -DFLAC__NO_ASM
56 endif
57 endif
58
59@@ -58,6 +63,8 @@ endif
60 if FLaC__CPU_PPC
61 ARCH_SUBDIRS = ppc
62 if FLaC__HAS_AS__TEMPORARILY_DISABLED
63+if FLaC__CPU_PPC_SPE
64+else
65 LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
66 LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
67 else
68@@ -68,6 +75,7 @@ endif
69 endif
70 endif
71 endif
72+endif
73
74 libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
75
76--
771.5.6.5
78