Skip to content
GitLab
Commit 9a6972c8 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by On2 (Google) Code Review
Browse files

Merge "x86inc: add some more format identifiers for elf file format recognition." into experimental

parents 4f895226 5ea9e2a6
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 10 additions and 0 deletions
third_party/x86inc/x86inc.asm
+ 10
− 0
View file @ 9a6972c8
...@@ -57,6 +57,8 @@ ...@@ -57,6 +57,8 @@
%define mangle(x) x %define mangle(x) x
%elifidn __OUTPUT_FORMAT__,elf64 %elifidn __OUTPUT_FORMAT__,elf64
%define mangle(x) x %define mangle(x) x
%elifidn __OUTPUT_FORMAT__,elf
%define mangle(x) x
%elifidn __OUTPUT_FORMAT__,x64 %elifidn __OUTPUT_FORMAT__,x64
%define mangle(x) x %define mangle(x) x
%else %else
...@@ -515,6 +517,10 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 ...@@ -515,6 +517,10 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
%xdefine current_function %1 %xdefine current_function %1
%ifidn __OUTPUT_FORMAT__,elf %ifidn __OUTPUT_FORMAT__,elf
global %1:function hidden global %1:function hidden
%elifidn __OUTPUT_FORMAT__,elf32
global %1:function hidden
%elifidn __OUTPUT_FORMAT__,elf64
global %1:function hidden
%else %else
global %1 global %1
%endif %endif
...@@ -550,6 +556,10 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 ...@@ -550,6 +556,10 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
; executable by default. ; executable by default.
%ifidn __OUTPUT_FORMAT__,elf %ifidn __OUTPUT_FORMAT__,elf
SECTION .note.GNU-stack noalloc noexec nowrite progbits SECTION .note.GNU-stack noalloc noexec nowrite progbits
%elifidn __OUTPUT_FORMAT__,elf32
SECTION .note.GNU-stack noalloc noexec nowrite progbits
%elifidn __OUTPUT_FORMAT__,elf64
SECTION .note.GNU-stack noalloc noexec nowrite progbits
%endif %endif
; cpuflags ; cpuflags
......
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