x86inc: add some more format identifiers for elf file format recognition.

Change-Id: I3582c64200eed3606a4b57a9f78624ec46041461

diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm
index a7066b6dafbe28608cd610cfd35b351f9bc9e05b..238571d6ac80c1c8faa81c928c7a888db574c1cd 100644 (file)
--- a/third_party/x86inc/x86inc.asm
+++ b/third_party/x86inc/x86inc.asm
@@ -57,6 +57,8 @@
     %define mangle(x) x
 %elifidn __OUTPUT_FORMAT__,elf64
     %define mangle(x) x
+%elifidn __OUTPUT_FORMAT__,elf
+    %define mangle(x) x
 %elifidn __OUTPUT_FORMAT__,x64
     %define mangle(x) x
 %else
@@ -515,6 +517,10 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
     %xdefine current_function %1
     %ifidn __OUTPUT_FORMAT__,elf
         global %1:function hidden
+    %elifidn __OUTPUT_FORMAT__,elf32
+        global %1:function hidden
+    %elifidn __OUTPUT_FORMAT__,elf64
+        global %1:function hidden
     %else
         global %1
     %endif
@@ -550,6 +556,10 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
 ; executable by default.
 %ifidn __OUTPUT_FORMAT__,elf
 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
 
 ; cpuflags