Changeset 98975a8 in mainline for boot/Makefile.build

Timestamp:

2019-08-17T12:49:43Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

5b586b9

Parents:

643640a

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-28 16:06:30)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

arm32/integratorcp

File:

• boot/Makefile.build (modified) (2 diffs)

boot/Makefile.build

@@ -31 +31 @@
 include Makefile.common
 
-INCLUDES = -Igeneric/include -Iarch/$(KARCH)/include -Igenarch/include -I$(ROOT_PATH)/abi/arch/$(KARCH)/include -I$(ROOT_PATH)/abi/include
-OPTIMIZATION = 3
-
-DEFS = -DBOOT -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
-
-LDFLAGS = -Wl,--fatal-warnings,--warn-common $(EXTRA_LDFLAGS)
-
-COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -ffreestanding -nostdlib \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
-        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=. \
-        -Wa,--fatal-warnings
-
-GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
-        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe
-
-CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
-        -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe  -fno-stack-protector -fno-PIC
-
-ifeq ($(CONFIG_DEBUG),y)
-        COMMON_CFLAGS += -Werror
-endif
-
-ifeq ($(CONFIG_LINE_DEBUG),y)
-        COMMON_CFLAGS += -g
-endif
-
-ifeq ($(COMPILER),clang)
-        CFLAGS = $(COMMON_CFLAGS) $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
-else
-        CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
-endif
-
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-DEPENDS := $(addsuffix .d,$(basename $(SOURCES)))
-
 ifeq ($(CONFIG_COMPRESSED_INIT),y)
         COMPONENTS := $(addsuffix .gz, $(COMPONENTS))
@@ -80 +42 @@
 -include $(DEPENDS)
 
-$(BOOT_OUTPUT): $(RAW)
-        $(OBJCOPY) -O $(BFD_OUTPUT) $< $@
+depend: $(PRE_DEPEND)
 
-$(RAW): $(OBJECTS) $(LINK)
-        $(CC) $(CFLAGS) -Wl,-n $(LDFLAGS) -T $(LINK) -Wl,-M,-Map,$(MAP) -o $@ $(OBJECTS)
-
-$(LINK): | depend
-        $(CC) $(DEFS) $(CFLAGS) -D__ASSEMBLER__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
-
-%.o: %.s | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS)
-
-%.o: %.S | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS)
-
-%.o: %.c | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS)
-
-depend: $(PRE_DEPEND)
+../image.boot: ../build/dist/boot/image.boot
+        cp $< $@
 
 %.gz: %
         gzip -n -k -9 -f $<
-
-$(COMPS).tar: $(COMPONENTS)
-        tar --mtime='2032-01-01 00:00:00' --group=0 --owner=0 --no-acls --no-selinux --no-xattrs --format=ustar --transform 's/.*\///g' -cvf $@ $^
 
 $(COMPS).o: $(COMPS).tar