Check-in [8ed457fd51]
Overview
Comment:Fixed rewriting relative paths to headers and added various patches
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8ed457fd51435294ea76f8b3678237e979fafa14
User & Date: rkeene on 2014-05-17 04:39:52
Original Comment: Fixed rewriting relative paths to headers
Other Links: manifest | tags
Context
2014-05-17
05:00
Updated to compile on ARM -- requires libgcc symbols, however check-in: f0540f631f user: rkeene tags: trunk
04:39
Fixed rewriting relative paths to headers and added various patches check-in: 8ed457fd51 user: rkeene tags: trunk
2014-05-12
03:19
Updated to fallback to SHA1 if SHA256 is unavailable check-in: 3c8c30b6bf user: rkeene tags: trunk
Changes

Added build/tcc-patches/0.9.26/tcc-0.9.26-android.diff version [5aa6f17983].

            1  +diff -uNr tcc-0.9.26.orig/tcc.h tcc-0.9.26-1android/tcc.h
            2  +--- tcc-0.9.26.orig/tcc.h	2013-02-15 08:24:00.000000000 -0600
            3  ++++ tcc-0.9.26-1android/tcc.h	2014-05-16 23:38:17.599016999 -0500
            4  +@@ -43,7 +43,9 @@
            5  + #ifndef _WIN32
            6  + # include <unistd.h>
            7  + # include <sys/time.h>
            8  +-# include <sys/ucontext.h>
            9  ++# ifndef __ANDROID__
           10  ++#  include <sys/ucontext.h>
           11  ++# endif /* __ANDROID__ */
           12  + # include <sys/mman.h>
           13  + # ifndef CONFIG_TCC_STATIC
           14  + #  include <dlfcn.h>
           15  +@@ -146,7 +148,7 @@
           16  + # endif
           17  + #endif
           18  + 
           19  +-#if defined TCC_IS_NATIVE && !defined CONFIG_TCCBOOT
           20  ++#if defined TCC_IS_NATIVE && !defined CONFIG_TCCBOOT && !defined __ANDROID__
           21  + # define CONFIG_TCC_BACKTRACE
           22  + #endif
           23  + 
           24  +diff -uNr tcc-0.9.26.orig/tccrun.c tcc-0.9.26-1android/tccrun.c
           25  +--- tcc-0.9.26.orig/tccrun.c	2013-02-15 08:24:00.000000000 -0600
           26  ++++ tcc-0.9.26-1android/tccrun.c	2014-05-16 23:38:36.949016999 -0500
           27  +@@ -35,8 +35,10 @@
           28  + 
           29  + static void set_pages_executable(void *ptr, unsigned long length);
           30  + static void set_exception_handler(void);
           31  ++#ifdef CONFIG_TCC_BACKTRACE
           32  + static int rt_get_caller_pc(addr_t *paddr, ucontext_t *uc, int level);
           33  + static void rt_error(ucontext_t *uc, const char *fmt, ...);
           34  ++#endif
           35  + static int tcc_relocate_ex(TCCState *s1, void *ptr);
           36  + 
           37  + #ifdef _WIN64

Added build/tcc-patches/0.9.26/tcc-0.9.26-disablebcheck.diff version [3c86d855ec].

            1  +diff -uNr tcc-0.9.26.orig/lib/bcheck.c tcc-0.9.26-1disablebcheck/lib/bcheck.c
            2  +--- tcc-0.9.26.orig/lib/bcheck.c	2013-02-15 08:24:00.000000000 -0600
            3  ++++ tcc-0.9.26-1disablebcheck/lib/bcheck.c	2014-05-16 22:58:34.829016999 -0500
            4  +@@ -42,6 +42,7 @@
            5  + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
            6  +     || defined(__DragonFly__) || defined(__dietlibc__) \
            7  +     || defined(__UCLIBC__) || defined(__OpenBSD__) \
            8  ++    || (defined(__sun) && defined(__SVR4)) \
            9  +     || defined(_WIN32) || defined(TCC_UCLIBC)
           10  + #warning Bound checking does not support malloc (etc.) in this environment.
           11  + #undef CONFIG_TCC_MALLOC_HOOKS

Modified headers.awk from [2b29d7a703] to [41fecd6817].

     1      1   /^# [0-9][0-9]* /{
     2      2   	file = $3;
     3      3   
     4      4   	gsub(/^"/, "", file);
     5      5   	gsub(/"$/, "", file);
     6      6   
     7         -	while(gsub(/\/[^\/]*\/\.\.\//, "/", file)) {}
            7  +	while(sub(/\/\/*[^\/]*\/\.\.\/\/*/, "/", file)) {}
     8      8   
     9      9   	destfile = file;
    10     10   	if (!gsub(/^.*\/gcc\/.*\/include\//, "gcc/", destfile)) {
    11     11   		if (!gsub(/^.*\/include\//, "", destfile)) {
    12     12   			if (!gsub(/^.*\/include-fixed\//, "fix/", destfile)) {
    13     13   				next
    14     14   			}