ktcc: rollback to r9529

git-svn-id: svn://kolibrios.org@9558 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/ktcc/trunk/source/Makefile.linux32

@@ -2,7 +2,7 @@ CC=gcc
 NAME=kos32-tcc
 
 SRC=libtcc.c tcc.c
-CFLAGS= -DTCC_TARGET_MEOS_LINUX
+CFLAGS= -DTCC_TARGET_MEOS_LINUX 
 LFLAGS= -m32
 
 all:

programs/develop/ktcc/trunk/source/libtcc.c

@@ -113,12 +113,17 @@ static void tcc_set_lib_path_w32(TCCState *s)
 {
     char path[1024], *p;
     GetModuleFileNameA(tcc_module, path, sizeof path);
+#ifdef TCC_TARGET_KX
+	kx_fix_root_directory(path, sizeof path);
+    normalize_slashes(strlwr(path));
+#else
     p = tcc_basename(normalize_slashes(strlwr(path)));
     if (p - 5 > path && 0 == strncmp(p - 5, "/bin/", 5))
         p -= 5;
     else if (p > path)
         p--;
     *p = 0;
+#endif
     tcc_set_lib_path(s, path);
 }
 
@@ -150,13 +155,17 @@ BOOL WINAPI DllMain (HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved)
 #if defined TCC_TARGET_MEOS
 /* on Kolibri host, we suppose the lib and includes are at the location of 'tcc' /lib, /include */
 static void tcc_set_lib_path_kos(TCCState *s)
-{
+{
 	char** argv0 = (char**)0x20; // path in kolibri header
-    char path[1024], *p;
+    char path[1024], *p;
 	strncpy(path, *argv0, sizeof path);
+#ifdef TCC_TARGET_KX
+	kx_fix_root_directory(path, sizeof path);
+#else
 	p = tcc_basename(path);
     if (p > path) p--;
     *p = 0;
+#endif
     tcc_set_lib_path(s, path);
 }
 
@@ -165,7 +174,12 @@ static void tcc_set_lib_path_linux(TCCState *s)
 {
     char buff[4096+1];
     readlink("/proc/self/exe", buff, 4096);
+#ifdef TCC_TARGET_KX
+	kx_fix_root_directory(buff, sizeof buff);
+	const char *path = buff;
+#else
     const char *path = dirname(buff);
+#endif
     tcc_set_lib_path(s, path);
 }
 
@@ -1526,7 +1540,7 @@ ST_FUNC int tcc_add_crt(TCCState *s, const char *filename)
 {
     if (-1 == tcc_add_library_internal(s, "%s/%s",
         filename, 0, s->crt_paths, s->nb_crt_paths))
-        tcc_error("file '%s' not found", filename);
+        tcc_error_noabort("file '%s' not found", filename);
     return 0;
 }
 
@@ -1731,7 +1745,8 @@ LIBTCCAPI int tcc_set_output_type(TCCState *s, int output_type)
 #elif defined(TCC_TARGET_MEOS)
     if (s->output_type != TCC_OUTPUT_OBJ && !s->nostdlib)
     {
-        tcc_add_library_err(s, "c");
+        tcc_add_crt(s,"crt0.o");
+        //tcc_add_library(s,"lc.obj"); // adding libck.a dont work, because need to be added last
     }
 #else
     /* add libc crt1/crti objects */
@@ -2264,7 +2279,6 @@ ST_FUNC int tcc_parse_args1(TCCState *s, int argc, char **argv)
         case TCC_OPTION_B:
             /* set tcc utilities path (mainly for tcc development) */
             tcc_set_lib_path(s, optarg);
-            tcc_split_path(s, (void ***)&s->crt_paths, &s->nb_crt_paths, CONFIG_TCC_CRTPREFIX);
             break;
         case TCC_OPTION_l:
             args_parser_add_file(s, r, TCC_FILETYPE_BINARY);

programs/develop/ktcc/trunk/source/tcc.h

@@ -47,7 +47,7 @@
 #ifndef TCC_TARGET_MEOS
 #define TCC_TARGET_MEOS 
 #endif
-//void kx_fix_root_directory(char *buf, size_t size);
+void kx_fix_root_directory(char *buf, size_t size);
 #endif
 
 #ifndef _WIN32

programs/develop/ktcc/trunk/source/tcckx.c

@@ -269,8 +269,11 @@ typedef struct {
 	 tcc_free(str_arr);
 	 tcc_free(len_arr);
 	 tcc_free(sym_arr);
+
  }
 
+ 
+
  void kx_init(me_info* me) {
 	 ElfW(Sym) *sym;
 	 int sym_index = 1, sym_end = symtab_section->data_offset / sizeof(ElfW(Sym));
@@ -323,7 +326,6 @@ typedef struct {
 	This function correct tcc_root if tcc_root/kx is a run directory,
 	otherwise do trim filename
 */
-#if 0
  void kx_fix_root_directory(char *buf, size_t size) {
 	 
 	 int defult = 1;
@@ -364,6 +366,5 @@ typedef struct {
 	 }
 
 	 tcc_free(tcc_conf);
-	 kx_debug_output("tcc root = %s\n", buf);
- }
-#endif
+	 //kx_debug_output("tcc root = %s\n", buf);
+ }

programs/develop/ktcc/trunk/source/tccmeos.c

@@ -302,14 +302,8 @@ int tcc_output_me(TCCState* s1,const char *filename)
 #ifdef TCC_TARGET_KX
 	kx_init(&me);
 #endif
- 	if (s1->output_type != TCC_OUTPUT_OBJ && !s1->nostdlib){
-        tcc_add_crt(s1, "crt0.o");
-        tcc_add_library_err(s1, "tcc1");
-    }
-
 	relocate_common_syms();
 	assign_addresses(&me);
-
 #ifndef TCC_TARGET_KX    
     if(undef_sym_flag){
        tcc_error("Linker error!");