Define SIMD_INLINE using AOM_FORCE_INLINE

Change-Id: I7d6394e48e9b6093e5b523387ed250f371ee7fb9

diff --git a/aom_dsp/aom_dsp.mk b/aom_dsp/aom_dsp.mk
index 238853f869f18d89f5b535d3d150ab2b4ad9330a..c74bfe3f58f315bbf2717ad269e1556e7d4a3cc4 100644 (file)
--- a/aom_dsp/aom_dsp.mk
+++ b/aom_dsp/aom_dsp.mk
@@ -388,5 +388,15 @@ DSP_SRCS-yes += aom_dsp_rtcd.c
 DSP_SRCS-yes += aom_dsp_rtcd_defs.pl
 
 DSP_SRCS-yes += aom_simd.c
+DSP_SRCS-yes += aom_simd.h
+DSP_SRCS-yes += aom_simd_inline.h
+DSP_SRCS-yes += simd/v64_intrinsics.h
+DSP_SRCS-yes += simd/v64_intrinsics_c.h
+DSP_SRCS-yes += simd/v128_intrinsics.h
+DSP_SRCS-yes += simd/v128_intrinsics_c.h
+DSP_SRCS-$(HAVE_SSE2) += simd/v64_intrinsics_x86.h
+DSP_SRCS-$(HAVE_SSE2) += simd/v128_intrinsics_x86.h
+DSP_SRCS-$(HAVE_NEON) += simd/v64_intrinsics_arm.h
+DSP_SRCS-$(HAVE_NEON) += simd/v128_intrinsics_arm.h
 
 $(eval $(call rtcd_h_template,aom_dsp_rtcd,aom_dsp/aom_dsp_rtcd_defs.pl))

diff --git a/aom_dsp/aom_simd.h b/aom_dsp/aom_simd.h
index 7ffca4ac95562a62c89458f808d67a1a7a6ee08a..3879d954b5db111e1fbb503d1709320059a8d872 100644 (file)
--- a/aom_dsp/aom_simd.h
+++ b/aom_dsp/aom_simd.h
@@ -9,20 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef _AOM_SIMD_H
-#define _AOM_SIMD_H
-
-#ifndef SIMD_INLINE
-#ifdef __GNUC__
-#define SIMD_INLINE static inline __attribute__((always_inline))
-#elif __STDC_VERSION__ >= 199901L
-#define SIMD_INLINE static inline
-#elif defined(_MSC_VER)
-#define SIMD_INLINE static __inline
-#else
-#define SIMD_INLINE static
-#endif
-#endif
+#ifndef AOM_DSP_AOM_AOM_SIMD_H_
+#define AOM_DSP_AOM_AOM_SIMD_H_
 
 #include <stdint.h>
 
@@ -31,6 +19,7 @@
 #endif
 
 #include "./aom_config.h"
+#include "./aom_simd_inline.h"
 
 #if HAVE_NEON
 #include "simd/v128_intrinsics_arm.h"
@@ -40,4 +29,4 @@
 #include "simd/v128_intrinsics.h"
 #endif
 
-#endif /* _AOM_SIMD_H */
+#endif  // AOM_DSP_AOM_AOM_SIMD_H_

diff --git a/aom_dsp/aom_simd_inline.h b/aom_dsp/aom_simd_inline.h
new file mode 100644 (file)
index 0000000..02a8b3a
--- /dev/null
+++ b/aom_dsp/aom_simd_inline.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_DSP_AOM_SIMD_INLINE_H_
+#define AOM_DSP_AOM_SIMD_INLINE_H_
+
+#include "aom/aom_integer.h"
+
+#ifndef SIMD_INLINE
+#define SIMD_INLINE static AOM_FORCE_INLINE
+#endif
+
+#endif  // AOM_DSP_AOM_SIMD_INLINE_H_