From a9dbc943aeb73d9267bfbefc95106974a3c94ea0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 27 Apr 2011 00:07:42 +0100 Subject: [linux] Avoid building Linux-specific prefix on non-Linux builds Reported-by: David Yeske Signed-off-by: Michael Brown --- src/arch/x86_64/core/linux/linuxprefix.S | 25 +++++++++++++++++++++++++ src/arch/x86_64/prefix/linuxprefix.S | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 src/arch/x86_64/core/linux/linuxprefix.S delete mode 100644 src/arch/x86_64/prefix/linuxprefix.S (limited to 'src/arch/x86_64') diff --git a/src/arch/x86_64/core/linux/linuxprefix.S b/src/arch/x86_64/core/linux/linuxprefix.S new file mode 100644 index 000000000..713b9e38d --- /dev/null +++ b/src/arch/x86_64/core/linux/linuxprefix.S @@ -0,0 +1,25 @@ +#include + + .section ".text" + .code64 + .globl _linux_start + .type _linux_start, @function + +_linux_start: + xorq %rbp, %rbp + + popq %rdi // argc -> C arg1 + movq %rsp, %rsi // argv -> C arg2 + + andq $~15, %rsp // 16-byte align the stack + + call save_args + + /* Our main doesn't use any arguments */ + call main + + movq %rax, %rdi // rc -> syscall arg1 + movq $__NR_exit, %rax + syscall + + .size _start, . - _start diff --git a/src/arch/x86_64/prefix/linuxprefix.S b/src/arch/x86_64/prefix/linuxprefix.S deleted file mode 100644 index 713b9e38d..000000000 --- a/src/arch/x86_64/prefix/linuxprefix.S +++ /dev/null @@ -1,25 +0,0 @@ -#include - - .section ".text" - .code64 - .globl _linux_start - .type _linux_start, @function - -_linux_start: - xorq %rbp, %rbp - - popq %rdi // argc -> C arg1 - movq %rsp, %rsi // argv -> C arg2 - - andq $~15, %rsp // 16-byte align the stack - - call save_args - - /* Our main doesn't use any arguments */ - call main - - movq %rax, %rdi // rc -> syscall arg1 - movq $__NR_exit, %rax - syscall - - .size _start, . - _start -- cgit v1.2.3-55-g7522