Changeset c31e536 in mainline

Timestamp:

2007-05-31T21:05:40Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

67f5fbd9

Parents:

f6d2c81

Message:

experimental support for ICC
(the sources has to be modified to avoid ICC compiler warnings)

Files:

• HelenOS.config (modified) (1 diff)
• kernel/Makefile (modified) (3 diffs)
• kernel/kernel.config (modified) (1 diff)

HelenOS.config

@@ -22 +22 @@
 
 # Compiler
-@ "cross" Cross-compiler
-@ "native" Native
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
 ! COMPILER (choice)
 

kernel/Makefile

@@ -38 +38 @@
 
 DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" -DKERNEL
-CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
+CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
 LFLAGS = -M
 AFLAGS =
@@ -119 +119 @@
 #
 
-ifeq ($(COMPILER),native)
+ifeq ($(COMPILER),gcc_native)
         CC = gcc
         AS = as
@@ -126 +126 @@
         OBJDUMP = objdump
         LIBDIR = /usr/lib
-else
+endif
+
+ifeq ($(COMPILER),icc_native)
+        CC = icc
+        AS = as
+        LD = ld
+        OBJCOPY = objcopy
+        OBJDUMP = objdump
+        LIBDIR = /usr/lib
+endif
+
+ifeq ($(COMPILER),gcc_cross)
         CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
         AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as

kernel/kernel.config

@@ -14 +14 @@
 
 # Compiler
-@ "cross" Cross-compiler
-@ "native" Native
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
 ! COMPILER (choice)