Changes in kernel/Makefile [fe171357:4761f54] in mainline

File:

• kernel/Makefile (modified) (6 diffs)

kernel/Makefile

@@ -59 +59 @@
 
 GENMAP = tools/genmap.py
+JOBFILE = $(ROOT_PATH)/tools/jobfile.py
 
 LINK = arch/$(KARCH)/_link.ld
 EMPTY_MAP = generic/src/debug/empty_map.o
 SIZEOK_MAP = generic/src/debug/sizeok_map.o
-
-ifeq ($(PRECHECK),y)
-        JOBFILE = $(ROOT_PATH)/tools/jobfile.py
-        # XXX: Do not change the order of arguments.
-        CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
-else
-        CC_JOB = $(CC) $< -o $@
-endif
 
 .PHONY: all clean autogen_clean depend
@@ -91 +84 @@
 COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
-        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+        -fexec-charset=UTF-8 -finput-charset=UTF-8
 
 GCC_CFLAGS = -std=gnu99 -Wall -Wextra -Wno-unused-parameter \
@@ -119 +111 @@
 # AFLAGS and LFLAGS must be initialized before the inclusion.
 #
-AFLAGS = --fatal-warnings
-LFLAGS = -n -T $(LINK) -M --fatal-warnings --warn-common
-
-ifeq ($(CONFIG_STRIP_BINARIES),y)
-        LFLAGS += --strip-all
+AFLAGS =
+LFLAGS = -n -T $(LINK) -M --fatal-warnings
+
+# FIXME: This condition is a workaround for issues #693 and #694.
+ifneq ($(KARCH),sparc64)
+ifneq ($(KARCH),mips32)
+        AFLAGS += --fatal-warnings
+endif
 endif
 
@@ -397 +392 @@
         $(LD) $(LFLAGS) -Map $(MAP) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS)
 endif
+ifeq ($(CONFIG_STRIP_BINARIES),y)
+        $(STRIP) $(RAW)
+endif
 
 $(LINK): $(LINK).in | depend
@@ -407 +405 @@
 
 %.o: %.S | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c -o $@ $<
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
+endif
 
 %.o: %.s | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c -o $@ $<
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
+endif
 
 %.o: %.c | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION))
+        $(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION)) -c -o $@ $<
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
+endif
 
 $(REAL_MAP).o: $(REAL_MAP).bin
@@ -451 +458 @@
         done
 
-depend: $(AUTOGENS_H)
+depend: $(COMMON_HEADER_ARCH) $(AUTOGENS_H)
+
+$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
+        ln -sfn ../../../../$< $@
 
 autogen_clean: