[LinksOS CVS Commit]kernel Makefile,1.7,1.8 machine.mk,1.5,1.6

[<ke...@to...>]

Update of /cvsroot/linksos/kernel
In directory router-internal.tossell.net:/tmp/cvs-serv31339

Modified Files:
	Makefile machine.mk 
Log Message:
Title: C++ Support
Changes: Changed symbol names, command lines, definitions to support c++ building. All g++ calls now include arguments not to include stdlib symbols. Calls to c++ routines in asm call the mangled c++ names, such as _Z7kprintfPc instead of kprintf. io.c's contents are moved into io.h, as inlines are not exported by g++. (Why should they be?) This change breaks portability, which I'll fix next.

Effects: LinksOS can now be compiled as c++ code, with the g++ compiler and the gnu as assembler.

a=kennyt b=19


Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/kernel/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	3 Jan 2003 23:34:58 -0000	1.7
--- Makefile	12 Jan 2003 18:51:05 -0000	1.8
***************
*** 7,11 ****
  	cd boot && make boot.o
  	cd main && make main.o
! 	$(LD)  -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -Ttext 0x100000
  
  clean:
--- 7,12 ----
  	cd boot && make boot.o
  	cd main && make main.o
! 	$(LD) -Bstatic -o kernel.bin hal/hal.o boot/boot.o main/main.o -Map main/kernel.map -Ttext 0x100000 --oformat elf32-i386
! #	$(CXX)  -o kernel.bin hal/hal.o boot/boot.o main/main.o
  
  clean:
***************
*** 13,15 ****
  	cd hal && make clean
  	cd boot && make clean
! 	cd main && make clean
\ No newline at end of file
--- 14,16 ----
  	cd hal && make clean
  	cd boot && make clean
! 	cd main && make clean

Index: machine.mk
===================================================================
RCS file: /cvsroot/linksos/kernel/machine.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** machine.mk	4 Jan 2003 09:36:39 -0000	1.5
--- machine.mk	12 Jan 2003 18:51:05 -0000	1.6
***************
*** 1,7 ****
  LD=ld
! CC=gcc
! CXX=g++
  ASM=as
  ARCH=x86
  
! INCDIRS=-I$(TOPDIR)include
\ No newline at end of file
--- 1,14 ----
+ # We don't want to use the stdlibc++
+ NOLIBS= -nostdlib -nostdinc -fno-builtin -fno-exceptions
+ 
+ # Compilers, etc.
  LD=ld
! CXX=g++ $(NOLIBS)
  ASM=as
+ 
+ # System architecture
+ # (Currently only x86 is supported. ppc will be available in the future.)
  ARCH=x86
  
! # Base includes
! INCDIRS=-I$(TOPDIR)include -I$(TOPDIR)hal/prototypes
\ No newline at end of file