summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vp8/common/x86/filter_x86.c3
-rw-r--r--vpx_dsp/deblock.c4
-rw-r--r--vpx_ports/mem.h6
3 files changed, 10 insertions, 3 deletions
diff --git a/vp8/common/x86/filter_x86.c b/vp8/common/x86/filter_x86.c
index 2405342f0..73435a7dd 100644
--- a/vp8/common/x86/filter_x86.c
+++ b/vp8/common/x86/filter_x86.c
@@ -17,7 +17,8 @@ DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_4[8][8]) = {
{ 32, 32, 32, 32, 96, 96, 96, 96 }, { 16, 16, 16, 16, 112, 112, 112, 112 }
};
-DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_8[8][16]) = {
+DECLARE_PROTECTED(DECLARE_ALIGNED(16, const short,
+ vp8_bilinear_filters_x86_8[8][16])) = {
{ 128, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 112, 112, 112, 112, 112, 112, 112, 112, 16, 16, 16, 16, 16, 16, 16, 16 },
{ 96, 96, 96, 96, 96, 96, 96, 96, 32, 32, 32, 32, 32, 32, 32, 32 },
diff --git a/vpx_dsp/deblock.c b/vpx_dsp/deblock.c
index a0db1e40c..3734ac251 100644
--- a/vpx_dsp/deblock.c
+++ b/vpx_dsp/deblock.c
@@ -9,9 +9,9 @@
*/
#include <assert.h>
#include <stdlib.h>
-#include "vpx/vpx_integer.h"
+#include "vpx_ports/mem.h"
-const int16_t vpx_rv[] = {
+DECLARE_PROTECTED(const int16_t vpx_rv[]) = {
8, 5, 2, 2, 8, 12, 4, 9, 8, 3, 0, 3, 9, 0, 0, 0, 8, 3, 14,
4, 10, 1, 11, 14, 1, 14, 9, 6, 12, 11, 8, 6, 10, 0, 0, 8, 9, 0,
3, 14, 8, 11, 13, 4, 2, 9, 0, 3, 9, 6, 1, 2, 3, 14, 13, 1, 8,
diff --git a/vpx_ports/mem.h b/vpx_ports/mem.h
index bfef783b1..35751cef8 100644
--- a/vpx_ports/mem.h
+++ b/vpx_ports/mem.h
@@ -23,6 +23,12 @@
#define DECLARE_ALIGNED(n, typ, val) typ val
#endif
+#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
+#define DECLARE_PROTECTED(decl) decl __attribute__((visibility("protected")))
+#else
+#define DECLARE_PROTECTED(decl) decl
+#endif
+
#if HAVE_NEON && defined(_MSC_VER)
#define __builtin_prefetch(x)
#endif