From de30a03cacc802329f1172a2a339179e5e4fb7d8 Mon Sep 17 00:00:00 2001
From: turbocat <turbocat@kolibrios.org>
Date: Thu, 10 Jun 2021 16:02:15 +0000
Subject: [PATCH] Fixed build libc.obj

git-svn-id: svn://kolibrios.org@8803 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 .../develop/ktcc/trunk/libc.obj/linuxtools/LoaderBuild    | 2 +-
 programs/develop/ktcc/trunk/libc.obj/source/Makefile      | 8 ++++----
 .../develop/ktcc/trunk/libc.obj/source/libtcc/Makefile    | 5 ++---
 .../develop/ktcc/trunk/libc.obj/source/libtcc/memcpy.asm  | 2 +-
 .../develop/ktcc/trunk/libc.obj/source/libtcc/memmove.asm | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/programs/develop/ktcc/trunk/libc.obj/linuxtools/LoaderBuild b/programs/develop/ktcc/trunk/libc.obj/linuxtools/LoaderBuild
index 6db7102e5c..925e787e1e 100755
--- a/programs/develop/ktcc/trunk/libc.obj/linuxtools/LoaderBuild
+++ b/programs/develop/ktcc/trunk/libc.obj/linuxtools/LoaderBuild
@@ -19,6 +19,6 @@ do
 done
 
 echo "Create libc.obj.a library..."
-ar -rsc ../lib/libc.obj.a *.o
+ar -rsc ../../bin/lib/libc.obj.a *.o
 rm -f *.asm *.o
 echo "Done!"
diff --git a/programs/develop/ktcc/trunk/libc.obj/source/Makefile b/programs/develop/ktcc/trunk/libc.obj/source/Makefile
index 38abde7f90..02da7ffcdd 100644
--- a/programs/develop/ktcc/trunk/libc.obj/source/Makefile
+++ b/programs/develop/ktcc/trunk/libc.obj/source/Makefile
@@ -8,13 +8,13 @@ FASM=fasm
 CFLAGS =  -c -nostdinc -I../include -DGNUC -D_BUILD_LIBC -fno-common -Os -fno-builtin -fno-leading-underscore -fno-pie
 
 SRC=libc.c
-LIB=../lib/libc.obj
+LIB=libc.obj
 
 all:
 	$(MAKE) -C ../linuxtools/src
-	mkdir -p exports ../lib
+	mkdir -p exports
 	../linuxtools/ExportGen symbols.txt exports/exports.c
-	$(FASM) crt/crt0.asm ../lib/crt0.o
+	$(FASM) crt/crt0.asm ../../bin/lib/crt0.o
 	$(GCC) $(CFLAGS) $(SRC) -o $(LIB)
 	$(KPACK) $(LIB)
 	../linuxtools/LoaderGen symbols.txt ../loader
@@ -25,4 +25,4 @@ install:
 	cp -f ../lib/libc.obj ~/.kex/root/RD/1/LIB
 
 clean:
-	rm ../lib/*
+	rm ../../bin/lib/libc.obj.a ../../bin/lib/libtcc.a
diff --git a/programs/develop/ktcc/trunk/libc.obj/source/libtcc/Makefile b/programs/develop/ktcc/trunk/libc.obj/source/libtcc/Makefile
index c941b684a0..3effd1a2c6 100755
--- a/programs/develop/ktcc/trunk/libc.obj/source/libtcc/Makefile
+++ b/programs/develop/ktcc/trunk/libc.obj/source/libtcc/Makefile
@@ -1,12 +1,11 @@
-KTCC_DIR=../../../../ktcc/trunk
+KTCC=kos32-tcc
 
-KTCC=$(KTCC_DIR)/bin/kos32-tcc
 FASM=fasm
 
 OBJ= memcpy.o  memmove.o  memset.o  libtcc1.o
 
 all: $(OBJ)
-	ar -crs ../../lib/libtcc.a $(OBJ)
+	ar -crs ../../../bin/lib/libtcc.a $(OBJ)
 	rm -f *.o
 
 %.o : %.c
diff --git a/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memcpy.asm b/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memcpy.asm
index 01ca3d1205..bc56bbbb06 100644
--- a/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memcpy.asm
+++ b/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memcpy.asm
@@ -1,7 +1,7 @@
 format ELF
 
 section '.text' executable
-include '../../../../../proc32.inc'
+include '../../../../../../proc32.inc'
 
 public memcpy
 
diff --git a/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memmove.asm b/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memmove.asm
index c7ee9e052d..26c24d7faf 100644
--- a/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memmove.asm
+++ b/programs/develop/ktcc/trunk/libc.obj/source/libtcc/memmove.asm
@@ -1,7 +1,7 @@
 format ELF
 
 section '.text' executable
-include '../../../../../proc32.inc'
+include '../../../../../../proc32.inc'
 
 public memmove