Overview
| Comment: | Updated to work harder to load shared objects (that are not ELF) |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
c32ff7df22cee2664aa2e57c0965d8d7 |
| User & Date: | rkeene on 2014-06-23 19:32:07 |
| Other Links: | manifest | tags |
Context
|
2014-06-23
| ||
| 19:35 | Fixed patch for searching based on current platform shared object name check-in: 3b13ded611 user: rkeene tags: trunk | |
| 19:32 | Updated to work harder to load shared objects (that are not ELF) check-in: c32ff7df22 user: rkeene tags: trunk | |
| 02:56 | Added "cwrap" subcommand to handle wrapping and creating prototype check-in: 2bc3ec252a user: rkeene tags: trunk | |
Changes
Modified Makefile.in from [e6a3711f94] to [86ec43e9b7].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 | PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ TCLCONFIGPATH = @TCLCONFIGPATH@ TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ tcllibdir = $(shell if echo "$(libdir)" | grep '^UNSPECIFIED' >/dev/null; then echo $(TCL_PACKAGE_PATH); else echo "$(libdir)"; fi) PACKAGE_INSTALL_DIR = $(tcllibdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
TCLCONFIGPATH = @TCLCONFIGPATH@
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
tcllibdir = $(shell if echo "$(libdir)" | grep '^UNSPECIFIED' >/dev/null; then echo $(TCL_PACKAGE_PATH); else echo "$(libdir)"; fi)
PACKAGE_INSTALL_DIR = $(tcllibdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
TCC_CONFIGURE_OPTS = --cc='$(CC)' --extra-cflags='$(CPPFLAGS) $(CFLAGS) -DSHOBJEXT=@SHOBJEXT@ @TCC_EXTRA_CFLAGS@' --with-tcl=$(TCLCONFIGPATH) --sysincludepaths='{B}/include@HOST_PATH_SEPARATOR@{B}/include/1@HOST_PATH_SEPARATOR@{B}/include/2@HOST_PATH_SEPARATOR@{B}/include/3@HOST_PATH_SEPARATOR@{B}/include/4@HOST_PATH_SEPARATOR@{B}/include/5@HOST_PATH_SEPARATOR@{B}/include/6@HOST_PATH_SEPARATOR@{B}/include/7@HOST_PATH_SEPARATOR@{B}/include/8@HOST_PATH_SEPARATOR@{B}/include/9' --libpaths='{B}/lib' @TCC_CONFIGURE_OPTS@
INSTALL_HEADERS = tcl.h assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h time.h wctype.h
srcdir = @srcdir@
host_os = @host_os@
@SET_MAKE@
all: $(TARGET) tcc/libtcc1.a
|
| ︙ | ︙ |
Added build/tcc-patches/0.9.26/tcc-0.9.26-sharedlibfix.diff version [82e03e9dec].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 |
diff -uNr tcc-0.9.26.orig/libtcc.c tcc-0.9.26-1sharedlibfix/libtcc.c
--- tcc-0.9.26.orig/libtcc.c 2013-02-15 08:24:00.000000000 -0600
+++ tcc-0.9.26-1sharedlibfix/libtcc.c 2014-06-23 14:18:02.279507000 -0500
@@ -1189,6 +1189,18 @@
#endif
tcc_error_noabort("unrecognized ELF file");
goto the_end;
+ } else {
+#ifdef TCC_IS_NATIVE
+ if (s1->output_type == TCC_OUTPUT_MEMORY) {
+ /* If it's not an ELF file, but dlopen() can open it, do that. */
+ void *h;
+ h = dlopen(filename, RTLD_GLOBAL | RTLD_LAZY);
+ if (h) {
+ ret = 0;
+ goto the_end;
+ }
+ }
+#endif
}
if (memcmp((char *)&ehdr, ARMAG, 8) == 0) {
@@ -1269,7 +1281,15 @@
const char *libs[] = { "%s/%s.def", "%s/lib%s.def", "%s/%s.dll", "%s/lib%s.dll", "%s/lib%s.a", NULL };
const char **pp = s->static_link ? libs + 4 : libs;
#else
+# ifdef SHOBJEXT
+# define str1(s) str2(s)
+# define str2(s) #s
+ const char *libs[] = { "%s/lib%s" str1(SHOBJEXT), "%s/lib%s.a", NULL };
+# undef str1
+# undef str2
+# else
const char *libs[] = { "%s/lib%s.so", "%s/lib%s.a", NULL };
+# endif
const char **pp = s->static_link ? libs + 1 : libs;
#endif
while (*pp) {
|