mirror of
https://github.com/drasko/codezero.git
synced 2026-02-28 01:33:13 +01:00
Very minor fixes.
This commit is contained in:
@@ -14,7 +14,7 @@ l4lib_headers = join(project_root, "tasks/libl4/include")
|
|||||||
config_h = join(project_root, "include/l4/config.h")
|
config_h = join(project_root, "include/l4/config.h")
|
||||||
|
|
||||||
env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
|
env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
|
||||||
CCFLAGS = ['-g', '-nostdlib', '-ffreestanding'],
|
CCFLAGS = ['-g', '-std=gnu99', '-nostdlib', '-ffreestanding'],
|
||||||
LINKFLAGS = ['-nostdlib'],
|
LINKFLAGS = ['-nostdlib'],
|
||||||
ENV = {'PATH' : os.environ['PATH']},
|
ENV = {'PATH' : os.environ['PATH']},
|
||||||
LIBS = 'gcc')
|
LIBS = 'gcc')
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include <string.h>
|
||||||
#include <sys/shm.h>
|
#include <sys/shm.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|||||||
@@ -257,7 +257,8 @@ int start_boot_task(struct vm_file *file, struct task_ids *ids)
|
|||||||
*/
|
*/
|
||||||
if ((err = do_mmap(file, 0, task, task->text_start,
|
if ((err = do_mmap(file, 0, task, task->text_start,
|
||||||
VM_READ | VM_WRITE | VM_EXEC | VMA_PRIVATE,
|
VM_READ | VM_WRITE | VM_EXEC | VMA_PRIVATE,
|
||||||
__pfn(page_align_up(task->text_end)))) < 0) {
|
__pfn(page_align_up(task->text_end) -
|
||||||
|
task->text_start))) < 0) {
|
||||||
printf("do_mmap: failed with %d.\n", err);
|
printf("do_mmap: failed with %d.\n", err);
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
|
|||||||
ASFLAGS = ['-D__ASSEMBLY__'],
|
ASFLAGS = ['-D__ASSEMBLY__'],
|
||||||
PROGSUFFIX = '.axf', # The suffix to use for final executable
|
PROGSUFFIX = '.axf', # The suffix to use for final executable
|
||||||
ENV = {'PATH' : os.environ['PATH']}, # Inherit shell path
|
ENV = {'PATH' : os.environ['PATH']}, # Inherit shell path
|
||||||
LIBS = [libc_name, 'gcc', libc_name, 'libl4', 'libposix'],
|
LIBS = [libc_name, 'gcc', libc_name, 'libl4', 'libposix', libc_name],
|
||||||
CPPFLAGS = "-D__USERSPACE__",
|
CPPFLAGS = "-D__USERSPACE__",
|
||||||
CPPPATH = ['#include', libl4_incpath, libposix_incpath, kernel_incpath])
|
CPPPATH = ['#include', libl4_incpath, libposix_incpath, kernel_incpath])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user