summaryrefslogtreecommitdiff
path: root/src/libFLAC/Makefile.am
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2012-02-13 19:46:32 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2012-02-13 19:46:32 +1100
commitb6e64af3b32cd25d44b757d86d35e6c38ab758bd (patch)
tree91bcf0c042cdede2cb2b254a16252b6da79cd783 /src/libFLAC/Makefile.am
parentc08b67923c207a48d2f7a838be9f53360ad04e36 (diff)
downloadflac-b6e64af3b32cd25d44b757d86d35e6c38ab758bd.tar.gz
Disable Altivec on host triplet powerpc-unknown-linux-gnuspe.
SPE is incompatible with AltiVec because it shares the same opcode range. Patch from Sebastian Andrzej Siewior <bigeasy@linutronix.de> via Debian.
Diffstat (limited to 'src/libFLAC/Makefile.am')
-rw-r--r--src/libFLAC/Makefile.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 636d4abc..2deb9587 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -40,8 +40,13 @@ if FLaC__SYS_DARWIN
CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
else
# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+CPUCFLAGS =
+if FLaC__CPU_PPC_SPE
+else
+CPUCFLAGS += -maltivec -mabi=altivec
+endif
#@@@ PPC optimizations temporarily disabled
-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+CPUCFLAGS += -DFLAC__NO_ASM
endif
endif
@@ -58,6 +63,8 @@ endif
if FLaC__CPU_PPC
ARCH_SUBDIRS = ppc
if FLaC__HAS_AS__TEMPORARILY_DISABLED
+if FLaC__CPU_PPC_SPE
+else
LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
else
@@ -68,6 +75,7 @@ endif
endif
endif
endif
+endif
libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@