Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2437 → Rev 2436

/trunk/kernel/kernel.config
13,9 → 13,8
! ARCH (choice)
 
# Compiler
@ "gcc_cross" GCC Cross-compiler
@ "gcc_native" GCC Native
@ "icc_native" ICC Native
@ "cross" Cross-compiler
@ "native" Native
! COMPILER (choice)
 
# CPU type
/trunk/kernel/Makefile
37,7 → 37,7
#
 
DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" -DKERNEL
CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
LFLAGS = -M
AFLAGS =
 
118,7 → 118,7
## Toolchain configuration
#
 
ifeq ($(COMPILER),gcc_native)
ifeq ($(COMPILER),native)
CC = gcc
AS = as
LD = ld
125,18 → 125,7
OBJCOPY = objcopy
OBJDUMP = objdump
LIBDIR = /usr/lib
endif
 
ifeq ($(COMPILER),icc_native)
CC = icc
AS = as
LD = ld
OBJCOPY = objcopy
OBJDUMP = objdump
LIBDIR = /usr/lib
endif
 
ifeq ($(COMPILER),gcc_cross)
else
CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
/trunk/HelenOS.config
21,9 → 21,8
! [PLATFORM=mips32] MACHINE (choice)
 
# Compiler
@ "gcc_cross" GCC Cross-compiler
@ "gcc_native" GCC Native
@ "icc_native" ICC Native
@ "cross" Cross-compiler
@ "native" Native
! COMPILER (choice)
 
# Debug build