diff --git a/.gitignore b/.gitignore index 6161cb6fb2..2661f93775 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ cscope.* size.report # Build system output .obj +*.elf bin diff --git a/Kernel/Makefile b/Kernel/Makefile index 015b6d3628..8246b38295 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -273,6 +273,9 @@ syscall_exec16.o: include/version.h include/kdata.h include/printf.h syscall_exec32.o: include/kernel.h include/panic.h include/sysinfoblk.h syscall_exec32.o: include/kernel32.h include/version.h include/kdata.h syscall_exec32.o: include/printf.h +syscall_execelf32.o: include/kernel.h include/panic.h include/sysinfoblk.h +syscall_execelf32.o: include/kernel32.h include/version.h include/kdata.h +syscall_execelf32.o: include/printf.h syscall_fs2.o: include/kernel.h include/panic.h include/sysinfoblk.h syscall_fs2.o: include/version.h include/kdata.h include/printf.h syscall_fs3.o: include/kernel.h include/panic.h include/sysinfoblk.h diff --git a/Kernel/include/tty.h b/Kernel/include/tty.h index 5685131840..bc1b2175f1 100644 --- a/Kernel/include/tty.h +++ b/Kernel/include/tty.h @@ -300,7 +300,7 @@ static uint8_t pbuff[TTYSIZ];\ {pbuf4, pubf4, pubf4, TTYSIZ, 0, TTYSIZ/2}, \ {pbuf5, pubf5, pubf5, TTYSIZ, 0, TTYSIZ/2}, \ {pbuf6, pubf6, pubf6, TTYSIZ, 0, TTYSIZ/2}, \ - {pbuf7, pubf7, pubf7, TTYSIZ, 0, TTYSIZ/2} + {pbuf7, pubf7, pubf7, TTYSIZ, 0, TTYSIZ/2}, \ {pbuf8, pubf8, pubf8, TTYSIZ, 0, TTYSIZ/2}, \ {pbuf9, pubf9, pubf9, TTYSIZ, 0, TTYSIZ/2}, \ {pbufa, pubfa, pubfa, TTYSIZ, 0, TTYSIZ/2}, \ diff --git a/Standalone/elf2flt.c b/Standalone/elf2flt.c index 1c2b399cb2..cada60f8cd 100644 --- a/Standalone/elf2flt.c +++ b/Standalone/elf2flt.c @@ -188,7 +188,7 @@ int main(int argc, char* const* argv) .rev = htonl(FLAT_VERSION), .flags = htonl(FLAT_FLAG_RAM), .entry = htonl(elffile->e_entry + sizeof(flatheader)), - .data_start = htonl(textlo + sizeof(flatheader)), + .data_start = htonl(datalo + sizeof(flatheader)), .data_end = htonl(datahi + sizeof(flatheader)), .bss_end = htonl(bsshi + sizeof(flatheader)), .reloc_start = htonl(datahi + sizeof(flatheader)),