Changeset f9d0a86 in mainline for kernel/Makefile

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

6cad776

Parents:

887c9de (diff), d2d142a (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.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

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
@@ -84 +91 @@
 COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8
+        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
+        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
 
 GCC_CFLAGS = -std=gnu99 -Wall -Wextra -Wno-unused-parameter \
@@ -111 +119 @@
 # AFLAGS and LFLAGS must be initialized before the inclusion.
 #
-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
+AFLAGS = --fatal-warnings
+LFLAGS = -n -T $(LINK) -M --fatal-warnings --warn-common
+
+ifeq ($(CONFIG_STRIP_BINARIES),y)
+        LFLAGS += --strip-all
 endif
 
@@ -392 +397 @@
         $(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
@@ -405 +407 @@
 
 %.o: %.S | depend
-        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c -o $@ $<
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
-endif
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.s | depend
-        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c -o $@ $<
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
-endif
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-        $(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
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION))
 
 $(REAL_MAP).o: $(REAL_MAP).bin
@@ -458 +451 @@
         done
 
-depend: $(COMMON_HEADER_ARCH) $(AUTOGENS_H)
-
-$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
-        ln -sfn ../../../../$< $@
+depend: $(AUTOGENS_H)
 
 autogen_clean: