Changeset 3e828ea in mainline for kernel/arch/mips32/meson.build

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/arch/mips32/meson.build (moved) (moved from uspace/srv/loader/Makefile ) (2 diffs)

kernel/arch/mips32/meson.build

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
-USPACE_PREFIX = ../..
-ROOT_PATH = $(USPACE_PREFIX)/..
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
+arch_src += files(
+        'src/start.S',
+        'src/context.S',
+        'src/mips32.c',
+        'src/asm.S',
+        'src/exception.c',
+        'src/interrupt.c',
+        'src/cache.c',
+        'src/debugger.c',
+        'src/cpu/cpu.c',
+        'src/debug/stacktrace.c',
+        'src/debug/stacktrace_asm.S',
+        'src/mm/km.c',
+        'src/mm/frame.c',
+        'src/mm/page.c',
+        'src/mm/tlb.c',
+        'src/mm/as.c',
+        'src/fpu_context.c',
+        'src/smc.c',
+        'src/smp/smp.c',
+        'src/machine_func.c',
+)
 
-include $(CONFIG_MAKEFILE)
+if MACHINE == 'lmalta' or MACHINE == 'bmalta'
+        arch_src += files('src/mach/malta/malta.c')
 
-ifeq ($(UARCH),ia64)
-        # IA64 has a peculiar linker script with a fixed data segment address.
-        # Because the loader is a separate nonrelocatable binary in the same
-        # address space as the application, we provide a modified copy of
-        # the default linker script to work around that.
-        EXTRA_LDFLAGS = -T elf64_ia64_loader.x
-else
-        # On all other architectures, we can simply move the text segment.
-        EXTRA_LDFLAGS = -Wl,-Ttext-segment=0x70000000
+elif MACHINE == 'msim'
+        arch_src += files(
+                'src/mach/msim/msim.c',
+                'src/mach/msim/dorder.c',
+        )
+
 endif
 
-BINARY = loader
-STATIC_ONLY = y
 
-GENERIC_SOURCES = \
-        main.c
+_check_headers = [
+        'include/arch/istate_struct.h',
+        'include/arch/context_struct.h',
+        'include/arch/fpu_context_struct.h',
+]
 
-SOURCES = \
-        $(GENERIC_SOURCES) \
-        $(ARCH_SOURCES)
-
-include $(USPACE_PREFIX)/Makefile.common
+foreach h : _check_headers
+        arch_src += [ autocheck.process(h) ]
+endforeach