diff --git a/AUTHORS b/AUTHORS index e09a695a..54ef18ae 100644 --- a/AUTHORS +++ b/AUTHORS @@ -88,7 +88,7 @@ lib/mach/*.S M2-Planet dependencies lib/m2/x86/x86_defs.M1 -lib/m2/x86/ELF-x86-debug.hex2 +lib/m2/x86/ELF-x86.hex2 * legalese Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen diff --git a/kaem.run b/kaem.run index 95d998ca..5cd7b721 100644 --- a/kaem.run +++ b/kaem.run @@ -24,17 +24,17 @@ mkdir -p m2 M2-Planet \ --bootstrap-mode \ --debug \ - --architecture x86 \ + --architecture ${mes_cpu} \ -f include/m2/lib.h \ - -f lib/linux/x86-mes-m2/crt1.c \ - -f lib/linux/x86-mes-m2/_exit.c \ - -f lib/linux/x86-mes-m2/_write.c \ + -f lib/linux/${mes_cpu}-mes-m2/crt1.c \ + -f lib/linux/${mes_cpu}-mes-m2/_exit.c \ + -f lib/linux/${mes_cpu}-mes-m2/_write.c \ -f lib/mes/globals.c \ -f lib/m2/cast.c \ -f lib/m2/exit.c \ -f lib/mes/mini-write.c \ - -f lib/linux/x86-mes-m2/syscall.c \ - -f include/linux/x86/syscall.h \ + -f lib/linux/${mes_cpu}-mes-m2/syscall.c \ + -f include/linux/${mes_cpu}/syscall.h \ -f lib/stub/__raise.c \ -f lib/linux/brk.c \ -f lib/m2/malloc.c \ @@ -119,10 +119,10 @@ blood-elf -f m2/mes.M1 -o m2/mes.blood-elf-M1 M1 \ --LittleEndian \ - --architecture x86 \ - -f lib/m2/x86/x86_defs.M1 \ - -f lib/x86-mes/x86.M1 \ - -f lib/linux/x86-mes-m2/crt1.M1 \ + --architecture ${mes_cpu} \ + -f lib/m2/${mes_cpu}/${mes_cpu}_defs.M1 \ + -f lib/${mes_cpu}-mes/${mes_cpu}.M1 \ + -f lib/linux/${mes_cpu}-mes-m2/crt1.M1 \ -f m2/mes.M1 \ -f m2/mes.blood-elf-M1 \ -o m2/mes.hex2 @@ -130,10 +130,10 @@ M1 \ mkdir -p bin hex2 \ --LittleEndian \ - --architecture x86 \ + --architecture ${mes_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/x86/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f m2/mes.hex2 \ -o bin/mes-m2 diff --git a/lib/m2/x86/ELF-x86-debug.hex2 b/lib/m2/x86/ELF-x86.hex2 similarity index 100% rename from lib/m2/x86/ELF-x86-debug.hex2 rename to lib/m2/x86/ELF-x86.hex2 diff --git a/scaffold/argv.kaem b/scaffold/argv.kaem index 6457a6e2..c694108e 100644 --- a/scaffold/argv.kaem +++ b/scaffold/argv.kaem @@ -52,7 +52,7 @@ hex2 \ --architecture ${stage0_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/${mes_cpu}/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f scaffold/argv.hex2 \ -o scaffold/argv-m2 diff --git a/scaffold/global-array.kaem b/scaffold/global-array.kaem index c9c056ec..dec0f764 100644 --- a/scaffold/global-array.kaem +++ b/scaffold/global-array.kaem @@ -51,7 +51,7 @@ hex2 \ --architecture ${stage0_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/${mes_cpu}/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f scaffold/global-array.hex2 \ -o scaffold/global-array diff --git a/scaffold/hello.kaem b/scaffold/hello.kaem index 00230c29..275ec9a5 100644 --- a/scaffold/hello.kaem +++ b/scaffold/hello.kaem @@ -51,7 +51,7 @@ hex2 \ --architecture ${stage0_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/${mes_cpu}/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f scaffold/hello.hex2 \ -o scaffold/hello-m2 diff --git a/scaffold/local-array.kaem b/scaffold/local-array.kaem index 3f549dcc..6c7e7184 100644 --- a/scaffold/local-array.kaem +++ b/scaffold/local-array.kaem @@ -51,7 +51,7 @@ hex2 \ --architecture ${stage0_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/${mes_cpu}/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f scaffold/local-array.hex2 \ -o scaffold/local-array diff --git a/scaffold/local-static-array.kaem b/scaffold/local-static-array.kaem index af892143..8811e153 100644 --- a/scaffold/local-static-array.kaem +++ b/scaffold/local-static-array.kaem @@ -51,7 +51,7 @@ hex2 \ --architecture ${stage0_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/${mes_cpu}/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f scaffold/local-static-array.hex2 \ -o scaffold/local-static-array diff --git a/scaffold/main.kaem b/scaffold/main.kaem index 65e0baad..0fc1329a 100644 --- a/scaffold/main.kaem +++ b/scaffold/main.kaem @@ -45,7 +45,7 @@ hex2 \ --architecture ${stage0_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/${mes_cpu}/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f scaffold/main.hex2 \ -o scaffold/main-m2 diff --git a/scaffold/read.kaem b/scaffold/read.kaem index 59768f40..02fb7c67 100644 --- a/scaffold/read.kaem +++ b/scaffold/read.kaem @@ -63,7 +63,7 @@ hex2 \ --architecture ${stage0_cpu} \ --BaseAddress 0x1000000 \ --exec_enable \ - -f lib/m2/${mes_cpu}/ELF-i386-debug.hex2 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ -f scaffold/read.hex2 \ -o scaffold/read-m2