mewin/bad_apple_os
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved SCons script for building the userspace stdlib.

Browse Source
This commit is contained in:
Patrick 2024-02-02 22:16:02 +01:00
parent a096458bdb
commit 3cd4fe9537
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@ -23,6 +23,7 @@ stdlib = GetOption('stdlib')
env = Environment(tools = ['default', 'compilation_db'], ENV = os.environ) # TODO inheriting the environment is not a best practice env = Environment(tools = ['default', 'compilation_db'], ENV = os.environ) # TODO inheriting the environment is not a best practice
env.Append(CCFLAGS = ['-g', '-O0', '-fno-stack-protector']) env.Append(CCFLAGS = ['-g', '-O0', '-fno-stack-protector'])
env.Append(CPPDEFINES = ['BASTL_EXTENSIONS=1']) env.Append(CPPDEFINES = ['BASTL_EXTENSIONS=1'])
env['TARGET_ARCH'] = target
# env.Append(CCFLAGS = ['-O2']) # env.Append(CCFLAGS = ['-O2'])
env['ISO_FILES'] = [] env['ISO_FILES'] = []

27
targets/_any/stdlib/SConscript
View File

@ -1,16 +1,20 @@
Import('env') Import('env')
shared_sources = Split(''' env['CRTI_PATH'] = env.File(f'src/crti.{env["TARGET_ARCH"]}.s').abspath
env['CRTN_PATH'] = env.File(f'src/crtn.{env["TARGET_ARCH"]}.s').abspath
env['CRT0_PATH'] = env.File(f'src/crt0.{env["TARGET_ARCH"]}.s').abspath
stdlib_sources = Split(f'''
src/assert.cpp src/assert.cpp
src/stdio.cpp src/stdio.cpp
src/stdlib.cpp src/stdlib.cpp
src/string.cpp src/string.cpp
src/memory.{env['TARGET_ARCH']}.s
''') ''')
kernel_sources = shared_sources env.Append(KERNEL_SOURCES = [env.File(f) for f in stdlib_sources])
env.Append(KERNEL_SOURCES = [env.File(f) for f in kernel_sources])
### Stdlib ### Stdlib
stdlib_env = env.Clone() stdlib_env = env.Clone()
@ -18,20 +22,17 @@ stdlib_env['AS'] = 'x86_64-baos-elf-as'
stdlib_env['CC'] = 'x86_64-baos-elf-gcc' stdlib_env['CC'] = 'x86_64-baos-elf-gcc'
stdlib_env['CXX'] = 'x86_64-baos-elf-g++' stdlib_env['CXX'] = 'x86_64-baos-elf-g++'
stdlib_env['LD'] = 'x86_64-baos-elf-g++' stdlib_env['LD'] = 'x86_64-baos-elf-g++'
stdlib_env['OBJSUFFIX'] = f'.baos{stdlib_env["OBJSUFFIX"]}'
stdlib_env.Append(CXXFLAGS = ['-fno-exceptions', '-fno-rtti', '-std=c++20']) stdlib_env.Append(CXXFLAGS = ['-fno-exceptions', '-fno-rtti', '-std=c++20'])
stdlib_env.Append(CPPPATH = ['#targets/_any/bastl/include', '#targets/_any/stdlib/include', '#targets/_any/kernel/include']) stdlib_env.Append(CPPPATH = ['#targets/_any/bastl/include', '#targets/_any/stdlib/include', '#targets/_any/kernel/include'])
stdlib_sources = Split('''
src/crt0.s
''')
for src in shared_sources:
new_src = stdlib_env.File(f'#.stdlib_variant/{stdlib_env.File(src).name}').abspath
stdlib_env.Command(new_src, src, Copy("$TARGET", "$SOURCE"))
stdlib_sources.append(new_src)
lib_stdlib = stdlib_env.StaticLibrary( lib_stdlib = stdlib_env.StaticLibrary(
target = stdlib_env.File('#stdlib.a'), target = stdlib_env.File('#stdlib/stdlib.a'),
source = stdlib_sources source = stdlib_sources
) )
stdlib_env.Default(lib_stdlib) crti_o = stdlib_env.Object(target = '#stdlib/crti.o', source = stdlib_env['CRTI_PATH'])
crtn_o = stdlib_env.Object(target = '#stdlib/crtn.o', source = stdlib_env['CRTN_PATH'])
crt0_o = stdlib_env.Object(target = '#stdlib/crt0.o', source = stdlib_env['CRT0_PATH'])
stdlib_env.Default([lib_stdlib, crti_o, crtn_o, crt0_o])
Return('env') Return('env')

0
targets/_any/stdlib/src/crt0.s → targets/_any/stdlib/src/crt0.x86_64.s
View File

0
targets/x86_64/src/crt/crti.s → targets/_any/stdlib/src/crti.x86_64.s
View File

0
targets/x86_64/src/crt/crtn.s → targets/_any/stdlib/src/crtn.x86_64.s
View File

0
targets/x86_64/src/cstdlib/memory.s → targets/_any/stdlib/src/memory.x86_64.s
View File

6
targets/x86_64/SConscript
View File

@ -24,16 +24,14 @@ def get_crt_object(name: str) -> str:
crtbegin_o = get_crt_object('crtbegin.o') crtbegin_o = get_crt_object('crtbegin.o')
crtend_o = get_crt_object('crtend.o') crtend_o = get_crt_object('crtend.o')
crti_o = kernel_env.Object('src/crt/crti.s') crti_o = kernel_env.Object(kernel_env['CRTI_PATH'])
crtn_o = kernel_env.Object('src/crt/crtn.s') crtn_o = kernel_env.Object(kernel_env['CRTN_PATH'])
kernel_env['LINKCOM'] = env['LINKCOM'].replace('$_LIBFLAGS', f'{crti_o[0].abspath} {crtbegin_o} -Wl,--start-group $_LIBFLAGS -Wl,--end-group -lgcc {crtend_o} {crtn_o[0].abspath}') kernel_env['LINKCOM'] = env['LINKCOM'].replace('$_LIBFLAGS', f'{crti_o[0].abspath} {crtbegin_o} -Wl,--start-group $_LIBFLAGS -Wl,--end-group -lgcc {crtend_o} {crtn_o[0].abspath}')
kernel_isr_sources = env['KERNEL_ISR_SOURCES'] + Split(''' kernel_isr_sources = env['KERNEL_ISR_SOURCES'] + Split('''
''') ''')
kernel_sources = env['KERNEL_SOURCES'] + Split(''' kernel_sources = env['KERNEL_SOURCES'] + Split('''
src/cstdlib/memory.s
src/kernel/boot.s src/kernel/boot.s
src/kernel/startup.cpp src/kernel/startup.cpp
''') + [kernel_env.Object(f, CCFLAGS = kernel_env['CCFLAGS'] + ['-mgeneral-regs-only']) for f in kernel_isr_sources] ''') + [kernel_env.Object(f, CCFLAGS = kernel_env['CCFLAGS'] + ['-mgeneral-regs-only']) for f in kernel_isr_sources]