Changeset b8e72fd1 in mainline for kernel/Makefile

Timestamp:

2013-05-30T17:13:02Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98abd40

Parents:

be2bb4f (diff), 94dfb92 (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) (2 diffs)

kernel/Makefile

@@ -100 +100 @@
         -Werror-implicit-function-declaration -wd170
 
+# clang does not support following options but I am not sure whether
+# something won't break because of that:
+# -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8
 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
-        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -arch $(CLANG_ARCH)
+        -integrated-as \
+        -pipe -target $(CLANG_TARGET)
 
 ifeq ($(CONFIG_DEBUG),y)
@@ -387 +390 @@
 
 $(LINK): $(LINK).in $(DEPEND)
-        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
 
 %.o: %.S $(DEPEND)