diff options
| author | Jonathan Lennox <jonathan@vidyo.com> | 2015-08-04 00:04:20 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-09-02 00:21:31 +0300 |
| commit | b4aa5dc858c905d9b09e70794584c44f7f4d2f7a (patch) | |
| tree | 51e9425b9ffb925071d92f43e511f6856a604476 /Makefile.am | |
| parent | 56d850412a2fc40bedb162de5e4b506bda2a5f4e (diff) | |
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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
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 |