Skip to content
GitLab
Commit 1f9943ab authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

x86inc.asm: fix symbol mangling and PIC handling on Win64/Mac64. 

Change-Id: I97aa175346683184f9430d880593b291a563e04f
parent 1fe85a35
v1.14.0-linphone 1.4.X experimental feature/update_to_v1.9.0-linphone feature/uwp_nuget forest frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m29-baseline m31-baseline m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck mcw mcw2 nextgen nextgenv2 pcs-2013 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/debargha/playground sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom stable-vp9-decoder v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone vp9-preview v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0 v1.3.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 3 deletions
vpx_ports/x86inc.asm
+ 13
− 3
View file @ 1f9943ab
...@@ -46,15 +46,21 @@ ...@@ -46,15 +46,21 @@
%define WIN64 1 %define WIN64 1
%elifidn __OUTPUT_FORMAT__,win64 %elifidn __OUTPUT_FORMAT__,win64
%define WIN64 1 %define WIN64 1
%elifidn __OUTPUT_FORMAT__,x64
%define WIN64 1
%else %else
%define UNIX64 1 %define UNIX64 1
%endif %endif
%endif %endif
%ifdef PREFIX %ifidn __OUTPUT_FORMAT__,elf32
%define mangle(x) _ %+ x %define mangle(x) x
%else %elifidn __OUTPUT_FORMAT__,elf64
%define mangle(x) x
%elifidn __OUTPUT_FORMAT__,x64
%define mangle(x) x %define mangle(x) x
%else
%define mangle(x) _ %+ x
%endif %endif
; FIXME: All of the 64bit asm functions that take a stride as an argument ; FIXME: All of the 64bit asm functions that take a stride as an argument
...@@ -89,11 +95,15 @@ ...@@ -89,11 +95,15 @@
%if WIN64 %if WIN64
%define PIC %define PIC
%elifidn __OUTPUT_FORMAT__,macho64
%define PIC
%elif ARCH_X86_64 == 0 %elif ARCH_X86_64 == 0
; x86_32 doesn't require PIC. ; x86_32 doesn't require PIC.
; Some distros prefer shared objects to be PIC, but nothing breaks if ; Some distros prefer shared objects to be PIC, but nothing breaks if
; the code contains a few textrels, so we'll skip that complexity. ; the code contains a few textrels, so we'll skip that complexity.
%undef PIC %undef PIC
%elif CONFIG_PIC
%define PIC
%endif %endif
%ifdef PIC %ifdef PIC
default rel default rel
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment