Changeset f9d0a86 in mainline for boot/Makefile.build
- Timestamp:
- 2017-11-14T12:24:42Z (6 years ago)
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.build
r887c9de rf9d0a86 31 31 include Makefile.common 32 32 33 INCLUDES = -Igeneric/include -I $(ROOT_PATH)/abi/include33 INCLUDES = -Igeneric/include -Iarch/$(KARCH)/include -Igenarch/include -I$(ROOT_PATH)/abi/include 34 34 OPTIMIZATION = 3 35 35 36 36 DEFS = -DBOOT -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__ 37 37 38 AFLAGS = 39 LFLAGS = --fatal-warnings 40 41 # FIXME: This condition is a workaround for issue #693. 42 ifneq ($(BARCH),mips32) 43 AFLAGS += --fatal-warnings 44 endif 38 AFLAGS = --fatal-warnings 39 LFLAGS = --fatal-warnings --warn-common 45 40 46 41 COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 47 42 -ffreestanding -fno-builtin -nostdlib -nostdinc \ 48 -fexec-charset=UTF-8 -finput-charset=UTF-8 43 -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \ 44 -fdebug-prefix-map=$(realpath $(ROOT_PATH))=. 49 45 50 46 GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ … … 76 72 77 73 clean: 78 rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)74 rm -f $(RAW) $(MAP) 79 75 80 76 -include $(DEPENDS) … … 91 87 $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK) 92 88 89 %.o: %.s | depend 90 $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ 91 93 92 %.o: %.S | depend 94 $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@ 95 ifeq ($(PRECHECK),y) 96 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__ 97 endif 93 $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ 98 94 99 95 %.o: %.c | depend 100 $(CC) -MD $(DEFS) $(CFLAGS) -c $< -o $@ 101 ifeq ($(PRECHECK),y) 102 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) 103 endif 96 $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) 104 97 105 %.o: %.s | depend 106 $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@ 107 ifeq ($(PRECHECK),y) 108 $(JOBFILE) $(JOB) $< $@ as asm 109 endif 110 111 depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) $(PRE_DEPEND) 98 depend: $(PRE_DEPEND) 112 99 113 100 $(COMPS).s: $(COMPS).zip … … 128 115 include Makefile.initrd 129 116 130 $(ARCH_INCLUDE): arch/$(KARCH)/include/131 ln -sfn ../../$< $@132 133 $(GENARCH_INCLUDE): genarch/include/134 ln -sfn ../../$< $@135 136 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)137 ln -sfn ../../../$< $@
Note:
See TracChangeset
for help on using the changeset viewer.