diff --git a/programs/develop/ktcc/trunk/libc.obj/.gitignore b/programs/develop/ktcc/trunk/libc.obj/.gitignore new file mode 100644 index 000000000..8211fe2bd --- /dev/null +++ b/programs/develop/ktcc/trunk/libc.obj/.gitignore @@ -0,0 +1,4 @@ +.tup +*.o +*.obj +*.kex \ No newline at end of file diff --git a/programs/develop/ktcc/trunk/libc.obj/lib/crt0.o b/programs/develop/ktcc/trunk/libc.obj/lib/crt0.o deleted file mode 100644 index 598dbd5fc..000000000 Binary files a/programs/develop/ktcc/trunk/libc.obj/lib/crt0.o and /dev/null differ diff --git a/programs/develop/ktcc/trunk/libc.obj/source/Tupfile.lua b/programs/develop/ktcc/trunk/libc.obj/source/Tupfile.lua index 380289707..574b09b7f 100755 --- a/programs/develop/ktcc/trunk/libc.obj/source/Tupfile.lua +++ b/programs/develop/ktcc/trunk/libc.obj/source/Tupfile.lua @@ -32,11 +32,15 @@ GAS_SRC = { "string/memmove.s" } +FASM_SRC = { + "crt/crt0.asm", +} + OBJS = {"libc.c"} -tup.append_table(OBJS, - tup.foreach_rule(GAS_SRC, "as --32 %f -o %o", "%B.o") -) +tup.append_table(OBJS, tup.foreach_rule(GAS_SRC, "as --32 %f -o %o", "%B.o")) -tup.rule(OBJS, "kos32-tcc" .. CFLAGS .. INCLUDES .. " %f -o %o " .. " && strip %o --strip-unneeded " , "libc.o") +tup.rule(OBJS, "kos32-tcc" .. CFLAGS .. INCLUDES .. " %f -o %o " .. " && strip %o --strip-unneeded ", "libc.o") tup.rule("libc.o", "objconv -fcoff32 %f %o " .. tup.getconfig("KPACK_CMD"), "%B.obj") + +tup.rule(FASM_SRC, "fasm %f %o", "%B.o")