Changeset e160bfe8 in mainline for boot

Timestamp:

2017-10-23T18:51:34Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (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 (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

Location:

boot

Files:

• Makefile (modified) (2 diffs)
• Makefile.build (modified) (3 diffs)
• Makefile.common (modified) (1 diff)

boot/Makefile

@@ -117 +117 @@
                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
-        if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
+        if ls $(DIST_OVERLAY_PATH)/* >/dev/null 2>/dev/null; then \
                 cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \
         fi
@@ -126 +126 @@
         $(MAKE) -r -f $(POSTBUILD) clean PRECHECK=$(PRECHECK)
 endif
-        rm -f $(POST_OUTPUT) $(BOOT_OUTPUT) $(DEPEND) $(DEPEND_PREV) arch/*/include/common.h
+        rm -f $(POST_OUTPUT) $(BOOT_OUTPUT) arch/*/include/common.h
         find generic/src/ arch/*/src/ genarch/src/ -name '*.o' -follow -exec rm \{\} \;
+        find generic/src/ arch/*/src/ genarch/src/ -name '*.d' -follow -exec rm \{\} \;
 
 clean_dist:

boot/Makefile.build

@@ -27 +27 @@
 #
 
-.PHONY: all clean
+.PHONY: all clean depend
 
 include Makefile.common
@@ -64 +64 @@
 endif
 
-ifeq ($(COMPILER),gcc_native)
-        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-ifeq ($(COMPILER),gcc_cross)
-        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-ifeq ($(COMPILER),gcc_helenos)
-        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
 ifeq ($(COMPILER),clang)
         CFLAGS = $(COMMON_CFLAGS) $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+else
+        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
 endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+DEPENDS := $(addsuffix .d,$(basename $(SOURCES)))
 
 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(BOOT_OUTPUT)
-        -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
 
 clean:
         rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
 
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPEND)
-endif
+-include $(DEPENDS)
 
 AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
@@ -104 +88 @@
         $(LD) -n $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(OBJECTS)
 
-$(LINK): $(DEPEND)
+$(LINK): | depend
         $(CC) $(DEFS) $(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 $@
+%.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
 
-%.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+%.o: %.c | depend
+        $(CC) -MD $(DEFS) $(CFLAGS) -c $< -o $@
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
 endif
 
-%.o: %.s $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s | depend
+        $(CC) -MD $(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)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
-        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
+depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) $(PRE_DEPEND)
 
 $(COMPS).s: $(COMPS).zip

boot/Makefile.common

@@ -63 +63 @@
 GENARCH_INCLUDE = generic/include/genarch
 
-DEPEND = Makefile.depend
-DEPEND_PREV = $(DEPEND).prev
 DISTROOT = distroot
 INITRD = initrd