[LinksOS CVS Commit]kernel/boot/x86 multiboot.S,1.5,1.6
Status: Inactive
Brought to you by:
terencevs
|
From: <ke...@to...> - 2003-01-12 21:09:53
|
Update of /cvsroot/linksos/kernel/boot/x86 In directory router-internal.tossell.net:/tmp/cvs-serv2561/boot/x86 Modified Files: multiboot.S Log Message: Title: Core portability Changes: Made cmain a "C" function, removing mangling. Removed call to kprintf from ASM, and put it into cmain. Effects: Code should compile on other versions of g++, and only one function need be extern "C". a=kennyt Index: multiboot.S =================================================================== RCS file: /cvsroot/linksos/kernel/boot/x86/multiboot.S,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** multiboot.S 12 Jan 2003 18:51:05 -0000 1.5 --- multiboot.S 12 Jan 2003 21:09:49 -0000 1.6 *************** *** 47,61 **** /* Now enter the C main function... */ ! call EXT_C(_Z5cmainm14multiboot_info) ! ! /* Halt. */ ! pushl $halt_message ! call EXT_C(_Z7kprintfPc) loop: hlt jmp loop - - halt_message: - .asciz "Halted." /* Our stack area. */ --- 47,54 ---- /* Now enter the C main function... */ ! call EXT_C(cmain) loop: hlt jmp loop /* Our stack area. */ |