tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into eirikr/remove-netbsd-code-and-implement-meson-build-system

Browse Source
This commit is contained in:
Eirikr Hinngart 2025-06-04 11:02:43 -07:00 committed by GitHub
commit 8589abd527
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson_options.txt
View File

@ -4,7 +4,7 @@
option( option(
'arch', 'arch',
type : 'combo', type : 'combo',
choices : ['i386', 'x86_64'], choices : ['i386', 'x86_64', 'arm32', 'arm64'],
value : 'x86_64', value : 'x86_64',
description : 'Target architecture' description : 'Target architecture'
) )

12
minix/kernel/meson.build
View File

@ -13,11 +13,13 @@ kernel_sources = files(
'main.c', 'main.c',
'proc.c', 'proc.c',
'profile.c', 'profile.c',
'smp.c',
'system.c', 'system.c',
'table.c', 'table.c',
'usermapped_data.c', 'usermapped_data.c',
'utility.c', 'utility.c',
'watchdog.c' 'watchdog.c'
'wormhole.c'
) )
# System call handler sources # System call handler sources
@ -63,6 +65,7 @@ system_sources = files(
) )
# Architecture-specific sources for the i386 port # Architecture-specific sources for the i386 port
arch_i386_sources = files( arch_i386_sources = files(
'arch/i386/acpi.c', 'arch/i386/acpi.c',
'arch/i386/apic.c', 'arch/i386/apic.c',
@ -70,6 +73,7 @@ arch_i386_sources = files(
'arch/i386/arch_clock.c', 'arch/i386/arch_clock.c',
'arch/i386/arch_do_vmctl.c', 'arch/i386/arch_do_vmctl.c',
'arch/i386/arch_reset.c', 'arch/i386/arch_reset.c',
'arch/i386/arch_smp.c',
'arch/i386/arch_system.c', 'arch/i386/arch_system.c',
'arch/i386/arch_watchdog.c', 'arch/i386/arch_watchdog.c',
'arch/i386/breakpoints.c', 'arch/i386/breakpoints.c',
@ -99,7 +103,6 @@ arch_i386_sources = files(
'arch/i386/usermapped_data_arch.c', 'arch/i386/usermapped_data_arch.c',
'arch/i386/usermapped_glo_ipc.S', 'arch/i386/usermapped_glo_ipc.S',
) )
# For now the x86_64 port reuses the same source files as the i386 port. # For now the x86_64 port reuses the same source files as the i386 port.
# This allows building a 64-bit kernel with minimal changes. # This allows building a 64-bit kernel with minimal changes.
arch_x86_64_sources = files( arch_x86_64_sources = files(
@ -161,4 +164,11 @@ static_library(
'../include/arch/@0@/include'.format(arch) '../include/arch/@0@/include'.format(arch)
), ),
c_args: arch == 'x86_64' ? ['-m64'] : ['-m32'] c_args: arch == 'x86_64' ? ['-m64'] : ['-m32']
'arch/i386',
'system',
'..',
'../include',
'arch/i386/include',
'../include/arch/i386/include'
)
) )