Changeset f6b5593 in mainline for kernel/Makefile

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/Makefile (modified) (4 diffs)

kernel/Makefile

@@ -54 +54 @@
 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
         -fno-builtin -Wall -Wmissing-prototypes -Werror \
-        -nostdlib -nostdinc \
-        -wd170
+        -nostdlib -nostdinc -wd170
 
 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
         -xnolib -xc99=all -features=extensions \
         -erroff=E_ZERO_SIZED_STRUCT_UNION
+
+CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
+        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+        -finput-charset=UTF-8 -fno-builtin -Wall -Wextra -Wno-unused-parameter \
+        -Wmissing-prototypes -nostdlib -nostdinc -pipe
 
 LFLAGS = -M
@@ -109 +113 @@
 endif
 
-ifeq ($(COMPILER),icc_native)
+ifeq ($(COMPILER),gcc_cross)
+        CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
+        GCC = $(CC)
+        AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
+        LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
+        OBJCOPY = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objcopy
+        OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
+        LIBDIR = $(TOOLCHAIN_DIR)/lib
+        CFLAGS = $(GCC_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
+ifeq ($(COMPILER),icc)
         CC = icc
         GCC = gcc
@@ -121 +137 @@
 endif
 
-ifeq ($(COMPILER),suncc_native)
+ifeq ($(COMPILER),suncc)
         CC = suncc
         GCC = gcc
@@ -134 +150 @@
 endif
 
-ifeq ($(COMPILER),gcc_cross)
-        CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
-        GCC = $(CC)
-        AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
-        OBJCOPY = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
-        LIBDIR = $(TOOLCHAIN_DIR)/lib
-        CFLAGS = $(GCC_CFLAGS)
+ifeq ($(COMPILER),clang)
+        CC = clang
+        GCC = gcc
+        AS = $(BINUTILS_PREFIX)as
+        LD = $(BINUTILS_PREFIX)ld
+        OBJCOPY = $(BINUTILS_PREFIX)objcopy
+        OBJDUMP = $(BINUTILS_PREFIX)objdump
+        LIBDIR = /usr/lib
+        CFLAGS = $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif