Changeset bc73be3 in mainline for kernel/arch/mips32/Makefile.inc

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/arch/mips32/Makefile.inc (modified) (2 diffs)

kernel/arch/mips32/Makefile.inc

@@ -70 +70 @@
         arch/$(KARCH)/src/machine_func.c
 
-ifeq ($(MACHINE),msim)
-        ARCH_SOURCES += \
-                arch/$(KARCH)/src/smp/dorder.c
-endif
-
 ifeq ($(MACHINE),$(filter lmalta bmalta,$(MACHINE)))
         ARCH_SOURCES += arch/$(KARCH)/src/mach/malta/malta.c
@@ -80 +75 @@
 
 ifeq ($(MACHINE),msim)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/msim/msim.c
+        ARCH_SOURCES += \
+                arch/$(KARCH)/src/mach/msim/msim.c \
+                arch/$(KARCH)/src/mach/msim/dorder.c
 endif