Changeset 95c675b in mainline for boot/arch/mips32/Makefile.inc

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• boot/arch/mips32/Makefile.inc (modified) (3 diffs)

boot/arch/mips32/Makefile.inc

@@ -30 +30 @@
 BITS = 32
 EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mabi=32
+AS_PROLOG = .module softfloat;
 
 ifeq ($(MACHINE),msim)
@@ -74 +75 @@
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/putchar.c \
-        $(COMPS_C) \
+        $(COMPS).s \
+        $(COMPS)_desc.c \
         genarch/src/division.c \
         genarch/src/multiplication.c \
@@ -84 +86 @@
         generic/src/version.c \
         generic/src/inflate.c
+
+PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)