Changes in boot/Makefile.build [a0a273e:94c05b89] in mainline

File:

• boot/Makefile.build (modified) (5 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
 
-ICC_CFLAGS = -Wall -Wmissing-prototypes -Werror-implicit-function-declaration -wd170
+ICC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
+        -Werror-implicit-function-declaration -wd170
 
-CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+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
@@ -83 +84 @@
 
 ifeq ($(COMPILER),icc)
-        CFLAGS = $(COMMON_CFLAGS) $(ICC_CFLAGS) $(EXTRA_CFLAGS)
+        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
@@ -104 +105 @@
 endif
 
-AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
-
 $(BOOT_OUTPUT): $(RAW)
         $(OBJCOPY) -O $(BFD_OUTPUT) $< $@
@@ -113 +112 @@
 
 $(LINK): $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | 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__
@@ -128 +127 @@
 
 %.o: %.s $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+        $(AS) $(AFLAGS) -o $@ $<
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm