aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-08 10:52:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-08 10:52:51 +0200
commitfaafffaf82a28e76cb691d938bf9424b85448b0f (patch)
tree81d28ed56bab6b2b82d39cfae95f9833c1a142f0
parent3d5a995eac2a47ac116c3412b364c0d21717829b (diff)
parentad76e6e7e193b98e7335156422d35467816f9ef1 (diff)
downloadffmpeg-faafffaf82a28e76cb691d938bf9424b85448b0f.tar.gz
Merge commit 'ad76e6e7e193b98e7335156422d35467816f9ef1'
* commit 'ad76e6e7e193b98e7335156422d35467816f9ef1': x86inc: Set ELF hidden visibility for global constants Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/x86/x86inc.asm6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index ab3ca6c186..437d511531 100644
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -728,7 +728,11 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
%macro const 1-2+
%xdefine %1 mangle(private_prefix %+ _ %+ %1)
- global %1
+ %ifidn __OUTPUT_FORMAT__,elf
+ global %1:data hidden
+ %else
+ global %1
+ %endif
%1: %2
%endmacro