From b4aa5dc858c905d9b09e70794584c44f7f4d2f7a Mon Sep 17 00:00:00 2001 From: Jonathan Lennox Date: Mon, 3 Aug 2015 17:04:20 -0400 Subject: Reorganize configure's detection of intrinsics functions: Actually try to compile intrinsics rather than using the output of --help. Allow caller of configure script to set custom compiler options to enable intrinsics. Detect when intrinsics are always available, without needing special compiler options. Make naming of #defines for detected intrinsics support more systematic. --- Makefile.am | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 2a1ddc8e..51bce63c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,6 @@ SILK_SOURCES += $(SILK_SOURCES_ARM) if OPUS_ARM_NEON_INTR CELT_SOURCES += $(CELT_SOURCES_ARM_NEON_INTR) -OPUS_ARM_NEON_INTR_CPPFLAGS = -mfpu=neon endif if OPUS_ARM_EXTERNAL_ASM @@ -261,15 +260,15 @@ $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl SSE_OBJ = %_sse.o %_sse.lo %test_unit_mathops.o %test_unit_rotation.o if HAVE_SSE4_1 -$(SSE_OBJ): CFLAGS += -msse4.1 +$(SSE_OBJ): CFLAGS += $(OPUS_X86_SSE4_1_CFLAGS) else if HAVE_SSE2 -$(SSE_OBJ): CFLAGS += -msse2 +$(SSE_OBJ): CFLAGS += $(OPUS_X86_SSE2_CFLAGS) endif endif if OPUS_ARM_NEON_INTR CELT_ARM_NEON_INTR_OBJ = $(CELT_SOURCES_ARM_NEON_INTR:.c=.lo) \ %test_unit_rotation.o %test_unit_mathops.o -$(CELT_ARM_NEON_INTR_OBJ): CFLAGS += $(OPUS_ARM_NEON_INTR_CPPFLAGS) +$(CELT_ARM_NEON_INTR_OBJ): CFLAGS += $(OPUS_ARM_NEON_INTR_CFLAGS) endif -- cgit v1.2.1