Changes in boot/Makefile.build [d75dc05:96521f2f] in mainline

File:

• boot/Makefile.build (modified) (3 diffs)

boot/Makefile.build

@@ -36 +36 @@
 DEFS = -DBOOT -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
-AFLAGS =
 LFLAGS = --fatal-warnings
 
-# FIXME: This condition is a workaround for issue #693.
-ifneq ($(BARCH),mips32)
-        AFLAGS += --fatal-warnings
-endif
-
-COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8
-
-GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+GCC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
         -pipe
 
-CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+ICC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
+        -Werror-implicit-function-declaration -wd170
+
+CLANG_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe  -fno-stack-protector -fno-PIC
+        -pipe
 
 ifeq ($(CONFIG_DEBUG),y)
-        COMMON_CFLAGS += -Werror
+        GCC_CFLAGS += -Werror
+        ICC_CFLAGS += -Werror
 endif
 
 ifeq ($(CONFIG_LINE_DEBUG),y)
-        COMMON_CFLAGS += -g
+        GCC_CFLAGS += -g
+        ICC_CFLAGS += -g
+        CLANG_CFLAGS += -g
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_helenos)
-        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
+
+ifeq ($(COMPILER),icc)
+        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-        CFLAGS = $(COMMON_CFLAGS) $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+COMPONENT_OBJECTS := $(addsuffix .co,$(basename $(MODULES)))
 
 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(BOOT_OUTPUT)
@@ -92 +102 @@
         rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
 
-ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
-endif
-
-AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
 
 $(BOOT_OUTPUT): $(RAW)
         $(OBJCOPY) -O $(BFD_OUTPUT) $< $@
 
-$(RAW): $(OBJECTS) $(LINK)
-        $(LD) -n $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(OBJECTS)
+$(RAW): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
+        $(LD) -n $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
 
-$(LINK): $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
+$(LINK): $(LINK).comp $(DEPEND)
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).comp | grep -v "^\#" > $(LINK)
 
 %.o: %.S $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
@@ -119 +125 @@
 endif
 
-%.o: %.s $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm
-endif
-
-$(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) $(PRE_DEPEND)
+$(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
-
-$(COMPS).s: $(COMPS).zip
-        unzip -p $< $@ > $@
-
-$(COMPS).h: $(COMPS).zip
-        unzip -p $< $@ > $@
-
-$(COMPS)_desc.c: $(COMPS).zip
-        unzip -p $< $@ > $@
-
-$(COMPONENTS_DEFLATE): $(COMPS).zip
-        unzip -p $< $@ > $@
-
-$(COMPS).zip: $(COMPONENTS)
-        $(MKARRAY) --deflate $(COMPS) $(COMP) "$(AS_PROLOG)" ".section .components, \"a\"" $^
-
-include Makefile.initrd
 
 $(ARCH_INCLUDE): arch/$(KARCH)/include/