Check-in [84c0812a1d]
Overview
Comment:Updated to search library_paths for libtcc1.a for ELF as is done for PE
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:84c0812a1deb22f6e57cd2c84bbdb3f65f30d0ae
User & Date: rkeene on 2014-05-04 04:27:14
Other Links: manifest | tags
Context
2014-05-04
07:02
Removed spurious information from patch check-in: b3f189ad77 user: rkeene tags: trunk
04:27
Updated to search library_paths for libtcc1.a for ELF as is done for PE check-in: 84c0812a1d user: rkeene tags: trunk
04:26
Updated to set tcc_lib_path sooner, needed for setting library_paths correctly check-in: 9e75cf906d user: rkeene tags: trunk
Changes

Added build/tcc-patches/0.9.26/tcc-0.9.26-elfsearchforlibtcc.diff version [b6acadb6da].

































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
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
Binary files tcc-0.9.26.orig/.tccelf.c.swp and tcc-0.9.26-1elfsearchforlibtcc/.tccelf.c.swp differ
diff -uNr tcc-0.9.26.orig/tccelf.c tcc-0.9.26-1elfsearchforlibtcc/tccelf.c
--- tcc-0.9.26.orig/tccelf.c	2013-02-15 08:24:00.000000000 -0600
+++ tcc-0.9.26-1elfsearchforlibtcc/tccelf.c	2014-05-03 23:24:08.325640003 -0500
@@ -1349,7 +1349,27 @@
 static inline int tcc_add_support(TCCState *s1, const char *filename)
 {
     char buf[1024];
+    char *path;
+    void *check;
+    int i;
+
     snprintf(buf, sizeof(buf), "%s/%s", s1->tcc_lib_path, filename);
+    check = tcc_open(s1, buf);
+    if (check != NULL) {
+        tcc_close();
+    } else {
+        for (i = 0; i < s1->nb_library_paths; i++) {
+            path = s1->library_paths[i];
+            snprintf(buf, sizeof(buf), "%s/%s", path, filename);
+            check = tcc_open(s1, buf);
+
+            if (check != NULL) {
+                tcc_close();
+                break;
+            }
+        }
+    }
+
     return tcc_add_file(s1, buf);
 }
 

Modified tcc4tcl.tcl from [cf29842e65] to [3b40b22f76].

91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
  Log "INJECTING CCODE"
  append tcc(code) $code \n
}
proc ::tcc4tcl::cc {code} {
  variable tcc
  if {![info exists tcc(cc)]} {
      set tcc(cc) tcc1
      tcc4tcl [file join $::tcc4tcl::dir lib] $tcc(cc)
      $tcc(cc) add_library tcl8.5
      $tcc(cc) add_include_path [file join $::tcc4tcl::dir include]
  }
  Log code:$code
  $tcc(cc) compile $code
}
#----------------------------------------------------------- New DLL API







|







91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
  Log "INJECTING CCODE"
  append tcc(code) $code \n
}
proc ::tcc4tcl::cc {code} {
  variable tcc
  if {![info exists tcc(cc)]} {
      set tcc(cc) tcc1
      tcc4tcl $::tcc4tcl::dir $tcc(cc)
      $tcc(cc) add_library tcl8.5
      $tcc(cc) add_include_path [file join $::tcc4tcl::dir include]
  }
  Log code:$code
  $tcc(cc) compile $code
}
#----------------------------------------------------------- New DLL API