From 524a028a4fa245358283ffc4abdd4d0cf6aaf71d Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sun, 28 Dec 2014 19:18:45 +0100 Subject: [PATCH] Forward compatibility with future rename of _start to __start. --- kernel/x64/boot.S | 4 ++++ kernel/x86/boot.S | 5 +++++ libc/x64/crt0.S | 4 ++++ libc/x86/crt0.S | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/kernel/x64/boot.S b/kernel/x64/boot.S index c9b77f0e..373f1d3b 100644 --- a/kernel/x64/boot.S +++ b/kernel/x64/boot.S @@ -27,9 +27,12 @@ .text 0x100000 .global _start +.global __start .type _start, @function +.type __start, @function .code32 _start: +__start: jmp prepare_kernel_execution # Align 32 bits boundary. @@ -148,6 +151,7 @@ Realm64: # actual 64-bit kernel. jmp Main .size _start, . - _start +.size __start, . - __start .section .data GDT64: # Global Descriptor Table (64-bit). diff --git a/kernel/x86/boot.S b/kernel/x86/boot.S index c4aeffce..e98633f0 100644 --- a/kernel/x86/boot.S +++ b/kernel/x86/boot.S @@ -27,8 +27,11 @@ .text 0x100000 .global _start +.global __start .type _start, @function +.type __start, @function _start: +__start: jmp prepare_kernel_execution # Align 32 bits boundary. @@ -66,3 +69,5 @@ prepare_kernel_execution: fxsave fpu_initialized_regs jmp beginkernel +.size _start, . - _start +.size __start, . - __start diff --git a/libc/x64/crt0.S b/libc/x64/crt0.S index afc928bb..01f26609 100644 --- a/libc/x64/crt0.S +++ b/libc/x64/crt0.S @@ -26,8 +26,11 @@ .section .text .global _start +.global __start .type _start, @function +.type __start, @function _start: +__start: # Set up end of the stack frame linked list. xorl %ebp, %ebp pushq %rbp # rip=0 @@ -57,3 +60,4 @@ _start: movl %eax, %edi call exit .size _start, .-_start +.size __start, .-__start diff --git a/libc/x86/crt0.S b/libc/x86/crt0.S index 3eadca77..7eede774 100644 --- a/libc/x86/crt0.S +++ b/libc/x86/crt0.S @@ -26,8 +26,11 @@ .section .text .global _start +.global __start .type _start, @function +.type __start, @function _start: +__start: # Set up end of the stack frame linked list. xorl %ebp, %ebp pushl %ebp # rip=0 @@ -61,3 +64,4 @@ _start: push %eax call exit .size _start, .-_start +.size __start, .-__start