mirror of
https://github.com/drasko/codezero.git
synced 2026-02-20 22:03:15 +01:00
libmem/lib{mm,mc,malloc} are added to the libraries of bare containers
againist which they are linked. (cherry picked from commit 9d90ee4c57f07dbbe984251023fc3fa684dd492c)
This commit is contained in:
committed by
Bahadir Balban
parent
38cf7bc175
commit
90cfaca7a2
@@ -19,33 +19,39 @@ config = configuration_retrieve()
|
|||||||
|
|
||||||
arch = config.arch
|
arch = config.arch
|
||||||
|
|
||||||
|
# Wrapper library for system calls
|
||||||
LIBL4_RELDIR = 'conts/libl4'
|
LIBL4_RELDIR = 'conts/libl4'
|
||||||
KERNEL_INCLUDE = join(PROJROOT, 'include')
|
KERNEL_INCLUDE = join(PROJROOT, 'include')
|
||||||
LIBL4_DIR = join(PROJROOT, LIBL4_RELDIR)
|
LIBL4_DIR = join(PROJROOT, LIBL4_RELDIR)
|
||||||
LIBL4_INCLUDE = join(LIBL4_DIR, 'include')
|
LIBL4_INCLUDE = join(LIBL4_DIR, 'include')
|
||||||
LIBL4_LIBPATH = join(BUILDDIR, LIBL4_RELDIR)
|
LIBL4_LIBPATH = join(BUILDDIR, LIBL4_RELDIR)
|
||||||
|
|
||||||
# Locally important paths are here
|
# Some user-space libraries
|
||||||
LIBC_RELDIR = 'conts/libc'
|
LIBC_RELDIR = 'conts/libc'
|
||||||
LIBC_DIR = join(PROJROOT, LIBC_RELDIR)
|
LIBC_DIR = join(PROJROOT, LIBC_RELDIR)
|
||||||
LIBC_LIBPATH = join(BUILDDIR, LIBC_RELDIR)
|
LIBC_LIBPATH = join(BUILDDIR, LIBC_RELDIR)
|
||||||
LIBC_INCLUDE = [join(LIBC_DIR, 'include'), \
|
LIBC_INCLUDE = [join(LIBC_DIR, 'include'), \
|
||||||
join(LIBC_DIR, 'include/arch' + '/' + arch)]
|
join(LIBC_DIR, 'include/arch' + '/' + arch)]
|
||||||
|
|
||||||
|
LIBMEM_RELDIR = 'conts/libmem'
|
||||||
|
LIBMEM_DIR = join(PROJROOT, LIBMEM_RELDIR)
|
||||||
|
LIBMEM_LIBPATH = join(BUILDDIR, LIBMEM_RELDIR)
|
||||||
|
LIBMEM_INCLUDE = LIBMEM_DIR
|
||||||
|
|
||||||
env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
|
env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
|
||||||
# We don't use -nostdinc because sometimes we need standard headers,
|
# We don't use -nostdinc because sometimes we need standard headers,
|
||||||
# such as stdarg.h e.g. for variable args, as in printk().
|
# such as stdarg.h e.g. for variable args, as in printk().
|
||||||
CCFLAGS = ['-g', '-mcpu=arm926ej-s', '-nostdlib', '-ffreestanding', \
|
CCFLAGS = ['-g', '-mcpu=arm926ej-s', '-nostdlib', '-ffreestanding', \
|
||||||
'-std=gnu99', '-Wall', '-Werror'], \
|
'-std=gnu99', '-Wall', '-Werror'],
|
||||||
LINKFLAGS = ['-nostdlib', '-T' + "include/linker.lds", "-u_start"],\
|
LINKFLAGS = ['-nostdlib', '-T' + "include/linker.lds", "-u_start"],
|
||||||
ASFLAGS = ['-D__ASSEMBLY__'], \
|
ASFLAGS = ['-D__ASSEMBLY__'],
|
||||||
PROGSUFFIX = '.elf', # The suffix to use for final executable\
|
PROGSUFFIX = '.elf', # The suffix to use for final executable
|
||||||
ENV = {'PATH' : os.environ['PATH']}, # Inherit shell path\
|
ENV = {'PATH' : os.environ['PATH']}, # Inherit shell path
|
||||||
LIBS = ['gcc', 'libl4', 'c-userspace', 'gcc', 'c-userspace'], # libgcc.a - This is required for division routines.
|
LIBS = ['gcc', 'libl4', 'c-userspace', 'libmm', 'libmc', 'libmalloc', \
|
||||||
CPPPATH = ["#include", KERNEL_INCLUDE, LIBL4_INCLUDE, LIBC_INCLUDE],
|
'gcc', 'c-userspace'], # libgcc.a - This is required for division routines.
|
||||||
LIBPATH = [LIBL4_LIBPATH, LIBC_LIBPATH],
|
CPPPATH = ["#include", KERNEL_INCLUDE, LIBL4_INCLUDE, LIBC_INCLUDE, LIBMEM_INCLUDE],
|
||||||
CPPFLAGS = '-include l4/config.h -include l4/macros.h -include l4/types.h')
|
LIBPATH = [LIBL4_LIBPATH, LIBC_LIBPATH, LIBMEM_LIBPATH],
|
||||||
|
CPPFLAGS = '-include l4/config.h -include l4/macros.h -include l4/types.h')
|
||||||
|
|
||||||
src = Glob('*.[cS]')
|
src = Glob('*.[cS]')
|
||||||
src += Glob('src/*.[cS]')
|
src += Glob('src/*.[cS]')
|
||||||
|
|||||||
Reference in New Issue
Block a user