From b0666ba6b68c5007aa7e3a549771616ec62aa764 Mon Sep 17 00:00:00 2001 From: Arun Thomas Date: Thu, 29 Mar 2012 13:29:09 +0200 Subject: [PATCH] kernel: Remove unnecessary ACK conditionals --- kernel/arch/i386/klib.S | 16 ---------------- kernel/arch/i386/mpx.S | 24 ------------------------ 2 files changed, 40 deletions(-) diff --git a/kernel/arch/i386/klib.S b/kernel/arch/i386/klib.S index 5c0c4f679..648c5cb0a 100644 --- a/kernel/arch/i386/klib.S +++ b/kernel/arch/i386/klib.S @@ -129,22 +129,6 @@ csinit: pop %ebp ret -/*===========================================================================*/ -/* exit */ -/*===========================================================================*/ -/* - * PUBLIC void exit(); - * Some library routines use exit, so provide a dummy version. - * Actual calls to exit cannot occur in the kernel. - * GNU CC likes to call ___main from main() for nonobvious reasons. - */ -#ifdef __ACK__ -ENTRY(exit) -ENTRY(_exit) -ENTRY(__exit) - sti - jmp _C_LABEL(__exit) -#endif ENTRY(__main) ret diff --git a/kernel/arch/i386/mpx.S b/kernel/arch/i386/mpx.S index 43b77926b..13ed04009 100644 --- a/kernel/arch/i386/mpx.S +++ b/kernel/arch/i386/mpx.S @@ -26,22 +26,6 @@ /* sections */ #include - -#ifdef __ACK__ -.text -begtext: -#ifdef __ACK__ -.rom -#else -.data -#endif -begrom: -.data -begdata: -.bss -begbss: -#endif - #include "../../kernel.h" #include #include @@ -70,10 +54,6 @@ IMPORT(mon_ds) IMPORT(switch_to_user) IMPORT(multiboot_init) -/* Exported variables. */ -.globl begbss -.globl begdata - .text /*===========================================================================*/ /* MINIX */ @@ -636,11 +616,7 @@ ENTRY(startup_ap_32) /* data */ /*===========================================================================*/ -#ifdef __ACK__ -.rom /* Before the string table please */ -#else .data -#endif .short 0x526F /* this must be the first data entry (magic #) */ .bss /* -- 2.44.0