Skip to content

Commit

Permalink
Merge branch 'mirabilos-asm-elf-pie' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
jsorg71 committed Sep 15, 2017
2 parents 0529c86 + acd9f3b commit 29600d3
Show file tree
Hide file tree
Showing 9 changed files with 414 additions and 353 deletions.
2 changes: 2 additions & 0 deletions src/amd64/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
NAFLAGS += -DASM_ARCH_AMD64

AMD64_ASM = \
cpuid_amd64.asm \
rfxcodec_encode_dwt_shift_amd64_sse2.asm \
Expand Down
5 changes: 1 addition & 4 deletions src/amd64/cpuid_amd64.asm
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -32,5 +30,4 @@ PROC cpuid_amd64
; restore registers
pop rbx
ret
align 16

END_OF_FILE
Loading

0 comments on commit 29600d3

Please sign in to comment.