Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1071 → Rev 1073

/shark/trunk/config/config.mk
59,11 → 59,19
CFG_VIDEO_OPT += -DCONFIG_FB_VGA16
endif
 
ifeq ($(findstring GCC4,$(COMPILER)) , GCC4)
# this options are for newer gcc4 compilers
C_WARN = -Wimplicit-function-declaration -Wno-attributes -Wno-pointer-sign -Wall
# in case of problems with older gcc versions, please
# comment the previous line and uncomment the following line
# C_WARN = -Wimplicit-function-declaration -Wall
endif
 
ifeq ($(findstring GCC3,$(COMPILER)) , GCC3)
C_WARN = -Wimplicit-function-declaration -Wall
endif
 
ifeq ($(findstring DJGPP,$(COMPILER)) , DJGPP)
C_WARN = -Wimplicit-function-declaration -Wall
endif
 
C_FLAGS = -O -fno-builtin -nostdinc -minline-all-stringops
C_INC = $(INCL) $(OTHERINCL) -I$(OSLIB)
C_MAC = $(CFG_OPT)
/shark/trunk/shark.cfg
1,6 → 1,12
# S.Ha.R.K. Setup File
#
 
# Compiler selection option
# S.Ha.R.K. 1.5.2 added the support of gcc 4 and higher versions.
# However, some options are not compatible with gcc 3 (and DJGPP).
# COMPILER = GCC3, GCC4, DJGPP
COMPILER = GCC4
 
# Kernel Image Start Point
# MEM_START = 0x220000
# The kernel image file will be loaded starting from this
/shark/trunk/oslib/config.mk
40,11 → 40,19
CFG_OPT += -D__OLD_TRACER__
endif
 
ifeq ($(findstring GCC4,$(COMPILER)) , GCC4)
# this options are for newer gcc4 compilers
C_OPT = -Wall -O -fno-builtin -nostdinc -Wno-attributes -Wno-pointer-sign -minline-all-stringops $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
# in case of problems with older gcc versions, please
# comment the previous line and uncomment the following line
# C_OPT = -Wall -O -fno-builtin -nostdinc -minline-all-stringops $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
endif
 
ifeq ($(findstring GCC3,$(COMPILER)) , GCC3)
C_OPT = -Wall -O -fno-builtin -nostdinc -minline-all-stringops $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
endif
 
ifeq ($(findstring DJGPP,$(COMPILER)) , DJGPP)
C_OPT = -Wall -O -fno-builtin -nostdinc -minline-all-stringops $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
endif
 
ASM_OPT = -x assembler-with-cpp $(CFG_OPT) -I$(INCL)
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH)