diff --git a/src/bin/cat/cat b/src/bin/cat/cat index 5a0ca3d..160f7cf 100755 --- a/src/bin/cat/cat +++ b/src/bin/cat/cat Binary files differ diff --git a/src/bin/tcc/config.h b/src/bin/tcc/config.h index 12327ba..6fde468 100644 --- a/src/bin/tcc/config.h +++ b/src/bin/tcc/config.h @@ -1,5 +1,5 @@ /* Automatically generated by configure - do not modify */ -#define CONFIG_TCCDIR "/lib/tcc" +#define CONFIG_TCCDIR "/tcc" #define GCC_MAJOR 3 #define HOST_I386 1 #define TCC_VERSION "0.9.23" diff --git a/src/bin/tcc/tcc.c b/src/bin/tcc/tcc.c index 697ebab..323a894 100644 --- a/src/bin/tcc/tcc.c +++ b/src/bin/tcc/tcc.c @@ -102,7 +102,7 @@ /* path to find crt1.o, crti.o and crtn.o. Only needed when generating executables or dlls */ -#define CONFIG_TCC_CRT_PREFIX "/usr/lib" +#define CONFIG_TCC_CRT_PREFIX "/tcc/lib" #define INCLUDE_STACK_SIZE 32 #define IFDEF_STACK_SIZE 64 @@ -9186,20 +9186,6 @@ func_old_type.t = VT_FUNC; func_old_type.ref = sym_push(SYM_FIELD, &int_type, FUNC_CDECL, FUNC_OLD); -#if 0 - /* define 'void *alloca(unsigned int)' builtin function */ - { - Sym *s1; - - p = anon_sym++; - sym = sym_push(p, mk_pointer(VT_VOID), FUNC_CDECL, FUNC_NEW); - s1 = sym_push(SYM_FIELD, VT_UNSIGNED | VT_INT, 0, 0); - s1->next = NULL; - sym->next = s1; - sym_push(TOK_alloca, VT_FUNC | (p << VT_STRUCT_SHIFT), VT_CONST, 0); - } -#endif - define_start = define_stack; if (setjmp(s1->error_jmp_buf) == 0) { @@ -9749,9 +9735,10 @@ tcc_add_library_path(s, buf); } #else - tcc_add_library_path(s, "/usr/local/lib"); - tcc_add_library_path(s, "/usr/lib"); - tcc_add_library_path(s, "/lib"); + //tcc_add_library_path(s, "/usr/local/lib"); + //tcc_add_library_path(s, "/usr/lib"); + //tcc_add_library_path(s, "/lib"); + tcc_add_library_path(s, "/tcc/lib"); #endif /* no section zero */ @@ -10049,8 +10036,9 @@ /* default include paths */ /* XXX: reverse order needed if -isystem support */ #ifndef TCC_TARGET_PE - tcc_add_sysinclude_path(s, "/usr/local/include"); - tcc_add_sysinclude_path(s, "/usr/include"); + //tcc_add_sysinclude_path(s, "/usr/local/include"); + //tcc_add_sysinclude_path(s, "/usr/include"); + tcc_add_sysinclude_path(s, "/tcc/include"); #endif snprintf(buf, sizeof(buf), "%s/include", tcc_lib_path); tcc_add_sysinclude_path(s, buf); diff --git a/src/bin/tcc/tccelf.c b/src/bin/tcc/tccelf.c index 2b17ad2..e4d4dfc 100644 --- a/src/bin/tcc/tccelf.c +++ b/src/bin/tcc/tccelf.c @@ -1062,7 +1062,7 @@ /* name of ELF interpreter */ #ifdef __FreeBSD__ -static char elf_interp[] = "/usr/libexec/ld-elf.so.1"; +static char elf_interp[] = "/tcc/lib/ld.so"; #else static char elf_interp[] = "/lib/ld-linux.so.2"; #endif