kernel: Remove unnecessary ACK conditionals
This commit is contained in:
parent
5ab87a6c38
commit
b0666ba6b6
|
@ -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
|
||||
|
|
|
@ -26,22 +26,6 @@
|
|||
/* sections */
|
||||
|
||||
#include <machine/vm.h>
|
||||
|
||||
#ifdef __ACK__
|
||||
.text
|
||||
begtext:
|
||||
#ifdef __ACK__
|
||||
.rom
|
||||
#else
|
||||
.data
|
||||
#endif
|
||||
begrom:
|
||||
.data
|
||||
begdata:
|
||||
.bss
|
||||
begbss:
|
||||
#endif
|
||||
|
||||
#include "../../kernel.h"
|
||||
#include <minix/config.h>
|
||||
#include <minix/const.h>
|
||||
|
@ -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
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue