Changeset 25eec4e in mainline for kernel/Makefile
- Timestamp:
- 2013-04-19T18:38:18Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6d717a4
- Parents:
- a1e2df13 (diff), 289cb7dd (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/Makefile
ra1e2df13 r25eec4e 36 36 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common 37 37 COMMON_HEADER = $(ROOT_PATH)/common.h 38 COMMON_HEADER_ARCH = arch/$(KARCH)/include/ common.h38 COMMON_HEADER_ARCH = arch/$(KARCH)/include/arch/common.h 39 39 40 40 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config … … 59 59 REAL_MAP = generic/src/debug/real_map 60 60 61 ABI_INCLUDE = generic/include/abi62 ARCH_INCLUDE = generic/include/arch63 GENARCH_INCLUDE = generic/include/genarch64 65 61 GENMAP = tools/genmap.py 66 62 JOBFILE = $(ROOT_PATH)/tools/jobfile.py … … 76 72 77 73 clean: 78 rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h74 rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* arch/*/_link.ld arch/*/include/arch/common.h 79 75 find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \; 80 76 … … 82 78 # 83 79 84 INCLUDES = generic/include 80 INCLUDES = generic/include genarch/include arch/$(KARCH)/include ../abi/include 81 INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES)) 85 82 86 83 ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y) … … 92 89 DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__ 93 90 94 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \91 GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 95 92 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 96 93 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ … … 99 96 -pipe 100 97 101 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \98 ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 102 99 -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \ 103 100 -Werror-implicit-function-declaration -wd170 104 101 105 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \102 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 106 103 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 107 104 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ … … 435 432 $(GENMAP) $(MAP_PREV) $(DUMP) $@ 436 433 437 $(DEPEND): $( ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)434 $(DEPEND): $(COMMON_HEADER_ARCH) 438 435 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null 439 436 -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ 440 437 441 $(ABI_INCLUDE): ../abi/include/442 ln -sfn ../../$< $@443 444 $(ARCH_INCLUDE): arch/$(KARCH)/include/445 ln -sfn ../../$< $@446 447 $(GENARCH_INCLUDE): genarch/include/448 ln -sfn ../../$< $@449 450 438 $(COMMON_HEADER_ARCH): $(COMMON_HEADER) 451 ln -sfn ../../../ $< $@439 ln -sfn ../../../../$< $@
Note:
See TracChangeset
for help on using the changeset viewer.