Merge branch 'mirabilos-asm-elf-pie' into devel

neutrinolabs · Sep 15, 2017 · 29600d3 · 29600d3
2 parents 0529c86 + acd9f3b
commit 29600d3
Show file tree

Hide file tree

Showing 9 changed files with 414 additions and 353 deletions.
diff --git a/src/amd64/Makefile.am b/src/amd64/Makefile.am
@@ -1,3 +1,5 @@
+NAFLAGS += -DASM_ARCH_AMD64
+
 AMD64_ASM = \
   cpuid_amd64.asm \
   rfxcodec_encode_dwt_shift_amd64_sse2.asm \

diff --git a/src/amd64/cpuid_amd64.asm b/src/amd64/cpuid_amd64.asm
@@ -1,7 +1,5 @@
 %include "common.asm"
 
-section .text
-
 ;The first six integer or pointer arguments are passed in registers
 ;RDI, RSI, RDX, RCX, R8, and R9
 
@@ -32,5 +30,4 @@ PROC cpuid_amd64
     ; restore registers
     pop rbx
     ret
-    align 16
-
+END_OF_FILE