[uClibc-cvs] uClibc/ldso/libdl dlib.c,1.34,1.35

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/libdl
In directory nail:/tmp/cvs-serv6107/libdl

Modified Files:
	dlib.c 
Log Message:
Step one, begin shuffling things around a bit


Index: dlib.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/libdl/dlib.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- dlib.c	29 Jan 2004 10:44:50 -0000	1.34
+++ dlib.c	7 Feb 2004 10:12:25 -0000	1.35
@@ -32,9 +32,9 @@
 extern void _dl_dprintf(int, const char *, ...) __attribute__ ((__weak__, __alias__ ("foobar")));
 extern char *_dl_find_hash(const char *, struct dyn_elf *, struct elf_resolve *, enum caller_type)
 	__attribute__ ((__weak__, __alias__ ("foobar")));
-extern struct elf_resolve * _dl_load_shared_library(int, struct dyn_elf **, struct elf_resolve *, char *)
+extern struct elf_resolve * _dl_load_shared_library(int, struct dyn_elf **, struct elf_resolve *, char *, int)
 	__attribute__ ((__weak__, __alias__ ("foobar")));
-extern struct elf_resolve * _dl_check_if_named_library_is_loaded(const char *full_libname)
+extern struct elf_resolve * _dl_check_if_named_library_is_loaded(const char *, int)
 	__attribute__ ((__weak__, __alias__ ("foobar")));
 extern int _dl_fixup(struct dyn_elf *rpnt, int lazy)
 	 __attribute__ ((__weak__, __alias__ ("foobar")));
@@ -79,7 +79,7 @@
 char *_dl_library_path = 0;
 char *_dl_ldsopath = 0;
 struct r_debug *_dl_debug_addr = NULL;
-static char *_dl_malloc_addr, *_dl_mmap_zero;
+static unsigned char *_dl_malloc_addr, *_dl_mmap_zero;
 #include "../ldso/_dl_progname.h"               /* Pull in the name of ld.so */
 #include "../ldso/hash.c"
 #define _dl_trace_loaded_objects    0
@@ -179,7 +179,7 @@
 	if(_dl_debug) 
 	_dl_dprintf(_dl_debug_file, "Trying to dlopen '%s'\n", (char*)libname);
 #endif
-	tpnt = _dl_load_shared_library(0, &rpnt, tfrom, (char*)libname);
+	tpnt = _dl_load_shared_library(0, &rpnt, tfrom, (char*)libname, 0);
 	if (tpnt == NULL) {
 		_dl_unmap_cache();
 		return NULL;
@@ -226,7 +226,7 @@
 						lpntstr, tcurr->libname);
 #endif
 
-				if (!(tpnt1 = _dl_load_shared_library(0, &rpnt, tcurr, lpntstr))) {
+				if (!(tpnt1 = _dl_load_shared_library(0, &rpnt, tcurr, lpntstr, 0))) {
 					goto oops;
 				}