Check-in [870c068689]
Overview
Comment:More android fixes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 870c06868982aeea2a2478d9bcaefe854c2f6d03
User & Date: rkeene on 2014-05-17 06:15:50
Other Links: manifest | tags
Context
2014-05-17
06:17
tcc4tcl 0.9 check-in: 21f45d469d user: rkeene tags: trunk, 0.9
06:15
More android fixes check-in: 870c068689 user: rkeene tags: trunk
06:00
tcc4tcl 0.8 check-in: 6b1cb98484 user: rkeene tags: trunk, 0.8
Changes

Modified build/tcc-patches/0.9.26/tcc-0.9.26-android.diff from [5aa6f17983] to [e50bd7eb09].

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
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);


|




















>
>
>
>
>
>
>
>
>
>
>
>
>







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
38
39
40
41
42
43
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-17 01:13:09.189016999 -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
 
@@ -917,8 +919,12 @@
 #else
 /* XXX: need to define this to use them in non ISOC99 context */
 extern float strtof (const char *__nptr, char **__endptr);
+#ifdef __ANDROID__
+#  define strtold (long double)strtod
+#else
 extern long double strtold (const char *__nptr, char **__endptr);
 #endif
+#endif
 
 #ifdef _WIN32
 #define IS_DIRSEP(c) (c == '/' || c == '\\')
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);