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

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























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

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

1
2
3
4
5
6
7
8
9
10
11
12
13
14
/^# [0-9][0-9]* /{
	file = $3;

	gsub(/^"/, "", file);
	gsub(/"$/, "", file);

	while(gsub(/\/[^\/]*\/\.\.\//, "/", file)) {}

	destfile = file;
	if (!gsub(/^.*\/gcc\/.*\/include\//, "gcc/", destfile)) {
		if (!gsub(/^.*\/include\//, "", destfile)) {
			if (!gsub(/^.*\/include-fixed\//, "fix/", destfile)) {
				next
			}






|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
/^# [0-9][0-9]* /{
	file = $3;

	gsub(/^"/, "", file);
	gsub(/"$/, "", file);

	while(sub(/\/\/*[^\/]*\/\.\.\/\/*/, "/", file)) {}

	destfile = file;
	if (!gsub(/^.*\/gcc\/.*\/include\//, "gcc/", destfile)) {
		if (!gsub(/^.*\/include\//, "", destfile)) {
			if (!gsub(/^.*\/include-fixed\//, "fix/", destfile)) {
				next
			}