Overview
| Comment: | Reverted [75e4d5fbed] and updated to do integration work in our driver directly |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
cbac5b0590e4f3851e4e3f3eccbbae4e |
| User & Date: | rkeene on 2014-05-05 21:12:08 |
| Other Links: | manifest | tags |
Context
|
2014-05-05
| ||
| 21:38 | Cleanup configure and also weaken static library symbols check-in: bab5762df8 user: rkeene tags: trunk | |
| 21:12 | Reverted [75e4d5fbed] and updated to do integration work in our driver directly check-in: cbac5b0590 user: rkeene tags: trunk | |
| 20:48 | Updated to be quieter during installation of header files check-in: 2e16cde0c4 user: rkeene tags: trunk | |
Changes
Modified build/tcc-patches/0.9.26/tcc-0.9.26-tcl.diff from [f74bb07351] to [e03734effa].
1
2
3
4
5
6
7
8
9
10
..
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
diff -uNr tcc-0.9.26.orig/configure tcc-0.9.26-1tcl/configure --- tcc-0.9.26.orig/configure 2013-02-15 09:24:00.000000000 -0500 +++ tcc-0.9.26-1tcl/configure 2014-05-05 12:35:23.109943527 -0400 @@ -43,6 +43,7 @@ tcc_libpaths="" tcc_crtprefix="" tcc_elfinterp="" +tcc_tcl_path="" tcc_lddir= confvars= ................................................................................ + fi + done +fi + cat <<EOF Binary directory $bindir TinyCC directory $tccdir diff -uNr tcc-0.9.26.orig/libtcc.c tcc-0.9.26-1tcl/libtcc.c --- tcc-0.9.26.orig/libtcc.c 2013-02-15 09:24:00.000000000 -0500 +++ tcc-0.9.26-1tcl/libtcc.c 2014-05-05 13:01:47.556096371 -0400 @@ -981,6 +981,11 @@ tcc_define_symbol(s, "__WCHAR_TYPE__", "int"); #endif + /* Tcl defines */ +#ifdef USE_TCL_STUBS + tcc_define_symbol(s, "USE_TCL_STUBS", "1"); +#endif + #ifndef TCC_TARGET_PE /* glibc defines */ tcc_define_symbol(s, "__REDIRECT(name, proto, alias)", "name proto __asm__ (#alias)"); diff -uNr tcc-0.9.26.orig/tcc.h tcc-0.9.26-1tcl/tcc.h --- tcc-0.9.26.orig/tcc.h 2013-02-15 09:24:00.000000000 -0500 +++ tcc-0.9.26-1tcl/tcc.h 2014-05-05 12:35:23.111943547 -0400 @@ -23,6 +23,9 @@ #define _GNU_SOURCE #include "config.h" +#ifdef HAVE_TCL_H +# include <tcl.h> +#endif #ifdef CONFIG_TCCBOOT #include "tccboot.h" diff -uNr tcc-0.9.26.orig/tccrun.c tcc-0.9.26-1tcl/tccrun.c --- tcc-0.9.26.orig/tccrun.c 2013-02-15 09:24:00.000000000 -0500 +++ tcc-0.9.26-1tcl/tccrun.c 2014-05-05 13:06:41.105088994 -0400 @@ -697,14 +697,17 @@ /* add the symbol you want here if no dynamic linking is done */ static TCCSyms tcc_syms[] = { -#if !defined(CONFIG_TCCBOOT) #define TCCSYM(a) { #a, &a, }, +#if !defined(CONFIG_TCCBOOT) TCCSYM(printf) TCCSYM(fprintf) TCCSYM(fopen) TCCSYM(fclose) -#undef TCCSYM #endif +#ifdef USE_TCL_STUBS + TCCSYM(tclStubsPtr) +#endif +#undef TCCSYM { NULL, NULL }, }; |
<
|
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
|
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
|
1
2
3
4
5
6
7
8
9
..
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
--- tcc-0.9.26.orig/configure 2013-02-15 08:24:00.000000000 -0600 +++ tcc-0.9.26-1tcl/configure 2014-05-01 19:50:10.103740647 -0500 @@ -43,6 +43,7 @@ tcc_libpaths="" tcc_crtprefix="" tcc_elfinterp="" +tcc_tcl_path="" tcc_lddir= confvars= ................................................................................ + fi + done +fi + cat <<EOF Binary directory $bindir TinyCC directory $tccdir --- tcc-0.9.26.orig/tcc.h 2013-02-15 08:24:00.000000000 -0600 +++ tcc-0.9.26-1tcl/tcc.h 2014-05-01 19:50:24.973630534 -0500 @@ -23,6 +23,9 @@ #define _GNU_SOURCE #include "config.h" +#ifdef HAVE_TCL_H +# include <tcl.h> +#endif #ifdef CONFIG_TCCBOOT #include "tccboot.h" |
Modified tcc4tcl.c from [aa505b066c] to [57a80f23fd].
252 253 254 255 256 257 258 259 260 261 262 263 264 265 |
}
}
s = tcc_new(Tcl_GetString(objv[1]));
if (s == NULL) {
return(TCL_ERROR);
}
tcc_set_error_func(s, interp, (void *)&Tcc4tclErrorFunc);
ts = (void *) ckalloc(sizeof(*ts));
ts->s = s;
ts->relocated = 0;
|
> > > > > |
252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 |
}
}
s = tcc_new(Tcl_GetString(objv[1]));
if (s == NULL) {
return(TCL_ERROR);
}
#ifdef USE_TCL_STUBS
tcc_add_symbol(s, "tclStubsPtr", &tclStubsPtr);
tcc_define_symbol(s, "USE_TCL_STUBS", "1");
#endif
tcc_set_error_func(s, interp, (void *)&Tcc4tclErrorFunc);
ts = (void *) ckalloc(sizeof(*ts));
ts->s = s;
ts->relocated = 0;
|