Begin removing some unnecessary inlining, and fix naming

of _dl_fprintf which should really be _dl_dprintf
 -Erik

14 files changed, 270 insertions, 1843 deletions

diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index 09b934a1a..f0c83a166 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -81,7 +81,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
 
 	if (reloc_type != R_ARM_JUMP_SLOT) {
-	  _dl_fprintf(2, "%s: Incorrect relocation type in jump relocations\n", 
+	  _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", 
 		       _dl_progname);
 	  _dl_exit(1);
 	};
@@ -92,7 +92,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	got_addr = (char **) instr_addr;
 
 #ifdef DL_DEBUG
-	_dl_fprintf(2, "Resolving symbol %s\n", 
+	_dl_dprintf(2, "Resolving symbol %s\n", 
 		strtab + symtab[symtab_index].st_name);
 #endif
 
@@ -100,13 +100,13 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	new_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name, 
 		tpnt->symbol_scope, (unsigned long) got_addr, tpnt, 0);
 	if (!new_addr) {
-		_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+		_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 			_dl_progname, strtab + symtab[symtab_index].st_name);
 		_dl_exit(1);
 	};
 #ifdef DL_DEBUG
 	if ((unsigned long) got_addr < 0x40000000) {
-		_dl_fprintf(2, "Calling library function: %s\n", 
+		_dl_dprintf(2, "Calling library function: %s\n", 
 			strtab + symtab[symtab_index].st_name);
 	} else {
 		*got_addr = new_addr;
@@ -156,13 +156,13 @@ void _dl_parse_lazy_relocation_information(struct elf_resolve *tpnt,
 			*reloc_addr += (unsigned long) tpnt->loadaddr;
 			break;
 		default:
-			_dl_fprintf(2, "%s: (LAZY) can't handle reloc type ", 
+			_dl_dprintf(2, "%s: (LAZY) can't handle reloc type ", 
 				_dl_progname);
 #ifdef VERBOSE_DLINKER
-			_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+			_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 			if (symtab_index)
-				_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 			_dl_exit(1);
 		};
 	};
@@ -239,7 +239,7 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 			 * here, so all bases should be covered.
 			 */
 			if (!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 						_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			}
@@ -267,7 +267,7 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 						topbits = newvalue & 0xfe000000;
 						if (topbits != 0xfe000000 && topbits != 0x00000000)
 						{
-							_dl_fprintf(2, "R_ARM_PC24 relocation out of range ");
+							_dl_dprintf(2, "R_ARM_PC24 relocation out of range ");
 							_dl_exit(1);
 						}
 					}
@@ -286,20 +286,20 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 			case R_ARM_COPY:						
 #if 0							
 				/* Do this later */
-				_dl_fprintf(2, "Doing copy for symbol ");
-				if (symtab_index) _dl_fprintf(2, strtab + symtab[symtab_index].st_name);
-				_dl_fprintf(2, "\n");
+				_dl_dprintf(2, "Doing copy for symbol ");
+				if (symtab_index) _dl_dprintf(2, strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "\n");
 				_dl_memcpy((void *) symtab[symtab_index].st_value, 
 						(void *) symbol_addr, symtab[symtab_index].st_size);
 #endif
 				break;
 			default:
-				_dl_fprintf(2, "%s: can't handle reloc type ", _dl_progname);
+				_dl_dprintf(2, "%s: can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-				_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+				_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 				if (symtab_index)
-					_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+					_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 				_dl_exit(1);
 		};
 
@@ -360,7 +360,7 @@ int _dl_parse_copy_information(struct dyn_elf *xpnt, unsigned long rel_addr,
 				symtab[symtab_index].st_name, xpnt->next, 
 				(unsigned long) reloc_addr, NULL, 1);
 			if (!symbol_addr) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 					_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			};
diff --git a/ldso/ldso/boot1.c b/ldso/ldso/boot1.c
index 038a68dbb..43c89adbc 100644
--- a/ldso/ldso/boot1.c
+++ b/ldso/ldso/boot1.c
@@ -207,7 +207,7 @@ DL_BOOT(unsigned long args)
 		Elf32_auxv_t *auxv_entry = (Elf32_auxv_t*) aux_dat;
 
 		if (auxv_entry->a_type <= AT_EGID) {
-			_dl_memcpy_inline(&(auxv_t[auxv_entry->a_type]), 
+			_dl_memcpy(&(auxv_t[auxv_entry->a_type]), 
 				auxv_entry, sizeof(Elf32_auxv_t));
 		}
 		aux_dat += 2;
@@ -221,7 +221,7 @@ DL_BOOT(unsigned long args)
 	/* Check the ELF header to make sure everything looks ok.  */
 	if (! header || header->e_ident[EI_CLASS] != ELFCLASS32 ||
 		header->e_ident[EI_VERSION] != EV_CURRENT || 
-		_dl_strncmp_inline((void *)header, ELFMAGIC, SELFMAG) != 0)
+		_dl_strncmp((void *)header, ELFMAGIC, SELFMAG) != 0)
 	{
 	    SEND_STDERR("Invalid ELF header\n");
 	    _dl_exit(0);
@@ -314,15 +314,15 @@ found_got:
 	}
 
 	tpnt = DL_MALLOC(sizeof(struct elf_resolve));
-	_dl_memset_inline(tpnt, 0, sizeof(*tpnt));
+	_dl_memset(tpnt, 0, sizeof(*tpnt));
 	app_tpnt = DL_MALLOC(sizeof(struct elf_resolve));
-	_dl_memset_inline(app_tpnt, 0, sizeof(*app_tpnt));
+	_dl_memset(app_tpnt, 0, sizeof(*app_tpnt));
 
 	/*
 	 * This is used by gdb to locate the chain of shared libraries that are currently loaded.
 	 */
 	debug_addr = DL_MALLOC(sizeof(struct r_debug));
-	_dl_memset_inline(debug_addr, 0, sizeof(*debug_addr));
+	_dl_memset(debug_addr, 0, sizeof(*debug_addr));
 
 	/* OK, that was easy.  Next scan the DYNAMIC section of the image.
 	   We are only doing ourself right now - we will have to do the rest later */
@@ -630,10 +630,10 @@ found_got:
 					if (!tpnt1) {
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects)
-							_dl_fprintf(1, "\t%s => not found\n", str);
+							_dl_dprintf(1, "\t%s => not found\n", str);
 						else {
 #endif
-							_dl_fprintf(2, "%s: can't load "
+							_dl_dprintf(2, "%s: can't load "
 								"library '%s'\n", _dl_progname, str);
 							_dl_exit(15);
 #ifdef DL_TRACE
@@ -646,7 +646,7 @@ found_got:
 							/* this is a real hack to make ldd not print 
 							 * the library itself when run on a library. */
 							if (_dl_strcmp(_dl_progname, str) != 0)
-								_dl_fprintf(1, "\t%s => %s (0x%x)\n", str, tpnt1->libname, 
+								_dl_dprintf(1, "\t%s => %s (0x%x)\n", str, tpnt1->libname, 
 									(unsigned) tpnt1->loadaddr);
 						}
 #endif
@@ -674,14 +674,14 @@ found_got:
 
 			if (!_dl_stat(LDSO_PRELOAD, &st) && st.st_size > 0) {
 				if ((fd = _dl_open(LDSO_PRELOAD, O_RDONLY)) < 0) {
-					_dl_fprintf(2, "%s: can't open file '%s'\n", 
+					_dl_dprintf(2, "%s: can't open file '%s'\n", 
 						_dl_progname, LDSO_PRELOAD);
 				} else {
 					preload = (caddr_t) _dl_mmap(0, st.st_size + 1, 
 						PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
 					_dl_close(fd);
 					if (preload == (caddr_t) - 1) {
-						_dl_fprintf(2, "%s: can't map file '%s'\n", 
+						_dl_dprintf(2, "%s: can't map file '%s'\n", 
 							_dl_progname, LDSO_PRELOAD);
 					} else {
 						char c, *cp, *cp2;
@@ -714,10 +714,10 @@ found_got:
 							if (!tpnt1) {
 #ifdef DL_TRACE
 								if (_dl_trace_loaded_objects)
-									_dl_fprintf(1, "\t%s => not found\n", cp2);
+									_dl_dprintf(1, "\t%s => not found\n", cp2);
 								else {
 #endif
-									_dl_fprintf(2, "%s: can't load library '%s'\n", 
+									_dl_dprintf(2, "%s: can't load library '%s'\n", 
 										_dl_progname, cp2);
 									_dl_exit(15);
 #ifdef DL_TRACE
@@ -727,7 +727,7 @@ found_got:
 #ifdef DL_TRACE
 								if (_dl_trace_loaded_objects
 									&& !tpnt1->usage_count) {
-									_dl_fprintf(1, "\t%s => %s (0x%x)\n", cp2, 
+									_dl_dprintf(1, "\t%s => %s (0x%x)\n", cp2, 
 										tpnt1->libname, (unsigned) tpnt1->loadaddr);
 								}
 #endif
@@ -766,7 +766,7 @@ found_got:
 
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects && !tpnt->usage_count) {
-						    _dl_fprintf(1, "\t%s => %s (0x%x)\n", 
+						    _dl_dprintf(1, "\t%s => %s (0x%x)\n", 
 							    lpnt, tpnt->libname, (unsigned) tpnt->loadaddr);
 						}
 #endif
@@ -789,10 +789,10 @@ found_got:
 					if (!(tpnt1 = _dl_load_shared_library(0, tcurr, lpnt))) {
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects)
-							_dl_fprintf(1, "\t%s => not found\n", lpnt);
+							_dl_dprintf(1, "\t%s => not found\n", lpnt);
 						else {
 #endif
-							_dl_fprintf(2, "%s: can't load library '%s'\n", 
+							_dl_dprintf(2, "%s: can't load library '%s'\n", 
 								_dl_progname, lpnt);
 							_dl_exit(16);
 #ifdef DL_TRACE
@@ -801,7 +801,7 @@ found_got:
 					} else {
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects && !tpnt1->usage_count)
-							_dl_fprintf(1, "\t%s => %s (0x%x)\n", lpnt, tpnt1->libname, 
+							_dl_dprintf(1, "\t%s => %s (0x%x)\n", lpnt, tpnt1->libname, 
 								(unsigned) tpnt1->loadaddr);
 #endif
 						rpnt->next = (struct dyn_elf *)
@@ -955,13 +955,13 @@ found_got:
 #undef DL_DEBUG
 #ifdef DL_DEBUG
 		else {
-			_dl_fprintf(2, tpnt->libname);
-			_dl_fprintf(2, ": ");
+			_dl_dprintf(2, tpnt->libname);
+			_dl_dprintf(2, ": ");
 			if (!_dl_atexit)
-				_dl_fprintf(2, "The address is atexit () is 0x0.");
+				_dl_dprintf(2, "The address is atexit () is 0x0.");
 			if (!tpnt->dynamic_info[DT_FINI])
-				_dl_fprintf(2, "Invalid .fini section.");
-			_dl_fprintf(2, "\n");
+				_dl_dprintf(2, "Invalid .fini section.");
+			_dl_dprintf(2, "\n");
 		}
 #endif
 #undef DL_DEBUG
@@ -996,7 +996,7 @@ int _dl_fixup(struct elf_resolve *tpnt)
 		goof += _dl_fixup(tpnt->next);
 	if (tpnt->dynamic_info[DT_REL]) {
 #ifdef ELF_USES_RELOCA
-		_dl_fprintf(2, "%s: can't handle REL relocation records\n", 
+		_dl_dprintf(2, "%s: can't handle REL relocation records\n", 
 			_dl_progname);
 		_dl_exit(17);
 #else
@@ -1015,7 +1015,7 @@ int _dl_fixup(struct elf_resolve *tpnt)
 		goof += _dl_parse_relocation_information(tpnt, 
 			tpnt->dynamic_info[DT_RELA], tpnt->dynamic_info[DT_RELASZ], 0);
 #else
-		_dl_fprintf(2, "%s: can't handle RELA relocation records\n", 
+		_dl_dprintf(2, "%s: can't handle RELA relocation records\n", 
 			_dl_progname);
 		_dl_exit(18);
 #endif
@@ -1054,7 +1054,7 @@ void *_dl_malloc(int size)
 		_dl_mmap_zero = _dl_malloc_addr = _dl_mmap((void *) 0, size, 
 			PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 		if (_dl_mmap_check_error(_dl_mmap_zero)) {
-			_dl_fprintf(2, "%s: mmap of a spare page failed!\n", _dl_progname);
+			_dl_dprintf(2, "%s: mmap of a spare page failed!\n", _dl_progname);
 			_dl_exit(20);
 		}
 	}
@@ -1113,144 +1113,8 @@ char *_dl_strdup(const char *string)
 	return retval;
 }
 
-char *_dl_get_last_path_component(char *path)
-{
-	char *s;
-
-	s=path+_dl_strlen(path)-1;
-
-	/* strip trailing slashes */
-	while (s != path && *s == '/') {
-		*s-- = '\0';
-	}
-
-	/* find last component */
-	s = _dl_strrchr(path, '/');
-	if (s == NULL || s[1] == '\0')
-		return path;
-	else
-		return s+1;
-}
-
-size_t _dl_strlen(const char * str)
-{
-	register char *ptr = (char *) str;
-
-	while (*ptr)
-		ptr++;
-	return (ptr - str);
-}
-
-char * _dl_strcpy(char * dst,const char *src)
-{
-	register char *ptr = dst;
-
-	while (*src)
-		*dst++ = *src++;
-	*dst = '\0';
-
-	return ptr;
-}
- 
-int _dl_strcmp(const char * s1,const char * s2)
-{
-	unsigned register char c1, c2;
-
-	do {
-		c1 = (unsigned char) *s1++;
-		c2 = (unsigned char) *s2++;
-		if (c1 == '\0')
-			return c1 - c2;
-	}
-	while (c1 == c2);
-
-	return c1 - c2;
-}
-
-int _dl_strncmp(const char * s1,const char * s2,size_t len)
-{
-	unsigned register char c1 = '\0';
-	unsigned register char c2 = '\0';
-
-	while (len > 0) {
-		c1 = (unsigned char) *s1++;
-		c2 = (unsigned char) *s2++;
-		if (c1 == '\0' || c1 != c2)
-			return c1 - c2;
-		len--;
-	}
-
-	return c1 - c2;
-}
-
-char * _dl_strchr(const char * str,int c)
-{
-	register char ch;
-
-	do {
-		if ((ch = *str) == c)
-			return (char *) str;
-		str++;
-	}
-	while (ch);
-
-	return 0;
-}
-
-char *_dl_strrchr(const char *str, int c)
-{
-    register char *prev = 0;
-    register char *ptr = (char *) str;
-
-    while (*ptr != '\0') {
-	if (*ptr == c)
-	    prev = ptr;
-	ptr++;  
-    }   
-    if (c == '\0')
-	return(ptr);
-    return(prev);
-}
-
-void * _dl_memcpy(void * dst, const void * src, size_t len)
-{
-	register char *a = dst;
-	register const char *b = src;
-
-	while (len--)
-		*a++ = *b++;
-
-	return dst;
-}
-
-#ifdef USE_CACHE
-int _dl_memcmp(const void * s1,const void * s2,size_t len)
-{
-	unsigned char *c1 = (unsigned char *)s1;
-	unsigned char *c2 = (unsigned char *)s2;
-
-	while (len--) {
-		if (*c1 != *c2) 
-			return *c1 - *c2;
-		c1++;
-		c2++;
-	}
-	return 0;
-}
-#endif
-
-void * _dl_memset(void * str,int c,size_t len)
-{
-	register char *a = str;
-
-	while (len--)
-		*a++ = c;
-
-	return str;
-}
-
 /* Minimum printf which handles only characters, %d's and %s's */
-void _dl_fprintf(int fd, const char *fmt, ...)
+void _dl_dprintf(int fd, const char *fmt, ...)
 {
     int num;
     va_list args;
@@ -1294,7 +1158,7 @@ void _dl_fprintf(int fd, const char *fmt, ...)
 		    {
 			char tmp[13];
 			num = va_arg(args, int);
-			string = _dl_simple_ltoa_inline(tmp, num);
+			string = _dl_simple_ltoa(tmp, num);
 			_dl_write(fd, string, _dl_strlen(string));
 			break;
 		    }
@@ -1303,7 +1167,7 @@ void _dl_fprintf(int fd, const char *fmt, ...)
 		    {
 			char tmp[13];
 			num = va_arg(args, int);
-			string = _dl_simple_ltoahex_inline(tmp, num);
+			string = _dl_simple_ltoahex(tmp, num);
 			_dl_write(fd, string, _dl_strlen(string));
 			break;
 		    }
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index ebc9bc8dc..75acde927 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -54,7 +54,7 @@ int _dl_map_cache(void)
 
 	if (_dl_stat(LDSO_CACHE, &st)
 		|| (fd = _dl_open(LDSO_CACHE, O_RDONLY)) < 0) {
-		_dl_fprintf(2, "%s: can't open cache '%s'\n", _dl_progname, LDSO_CACHE);
+		_dl_dprintf(2, "%s: can't open cache '%s'\n", _dl_progname, LDSO_CACHE);
 		_dl_cache_addr = (caddr_t) - 1;	/* so we won't try again */
 		return -1;
 	}
@@ -63,7 +63,7 @@ int _dl_map_cache(void)
 	_dl_cache_addr = (caddr_t) _dl_mmap(0, _dl_cache_size, PROT_READ, MAP_SHARED, fd, 0);
 	_dl_close(fd);
 	if (_dl_cache_addr == (caddr_t) - 1) {
-		_dl_fprintf(2, "%s: can't map cache '%s'\n", 
+		_dl_dprintf(2, "%s: can't map cache '%s'\n", 
 			_dl_progname, LDSO_CACHE);
 		return -1;
 	}
@@ -77,7 +77,7 @@ int _dl_map_cache(void)
 		(sizeof(header_t) + header->nlibs * sizeof(libentry_t))
 		|| _dl_cache_addr[_dl_cache_size - 1] != '\0') 
 	{
-		_dl_fprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, 
+		_dl_dprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, 
 			LDSO_CACHE);
 		goto fail;
 	}
@@ -90,7 +90,7 @@ int _dl_map_cache(void)
 		if (libent[i].sooffset >= strtabsize || 
 			libent[i].liboffset >= strtabsize) 
 		{
-			_dl_fprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, LDSO_CACHE);
+			_dl_dprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, LDSO_CACHE);
 			goto fail;
 		}
 	}
@@ -387,7 +387,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 		 * NO!  When we open shared libraries we may search several paths.
 		 * it is inappropriate to generate an error here.
 		 */
-		_dl_fprintf(2, "%s: can't open '%s'\n", _dl_progname, libname);
+		_dl_dprintf(2, "%s: can't open '%s'\n", _dl_progname, libname);
 #endif
 		_dl_internal_error_number = DL_ERROR_NOFILE;
 		return NULL;
@@ -400,7 +400,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 		epnt->e_ident[2] != 'L' || 
 		epnt->e_ident[3] != 'F') 
 	{
-		_dl_fprintf(2, "%s: '%s' is not an ELF file\n", _dl_progname,
+		_dl_dprintf(2, "%s: '%s' is not an ELF file\n", _dl_progname,
 					 libname);
 		_dl_internal_error_number = DL_ERROR_NOTELF;
 		_dl_close(infile);
@@ -415,7 +415,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 	{
 		_dl_internal_error_number = 
 		    (epnt->e_type != ET_DYN ? DL_ERROR_NOTDYN : DL_ERROR_NOTMAGIC);
-		_dl_fprintf(2, "%s: '%s' is not an ELF executable for " ELF_TARGET 
+		_dl_dprintf(2, "%s: '%s' is not an ELF executable for " ELF_TARGET 
 			"\n", _dl_progname, libname);
 		_dl_close(infile);
 		return NULL;
@@ -428,7 +428,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 
 		if (ppnt->p_type == PT_DYNAMIC) {
 			if (dynamic_addr)
-				_dl_fprintf(2, "%s: '%s' has more than one dynamic section\n", 
+				_dl_dprintf(2, "%s: '%s' has more than one dynamic section\n", 
 					_dl_progname, libname);
 			dynamic_addr = ppnt->p_vaddr;
 			dynamic_size = ppnt->p_filesz;
@@ -460,7 +460,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 	status = (char *) _dl_mmap((char *) (piclib ? 0 : minvma), 
 		maxvma - minvma, PROT_NONE, flags | MAP_ANONYMOUS, -1, 0);
 	if (_dl_mmap_check_error(status)) {
-		_dl_fprintf(2, "%s: can't map '/dev/zero'\n", _dl_progname);
+		_dl_dprintf(2, "%s: can't map '/dev/zero'\n", _dl_progname);
 		_dl_internal_error_number = DL_ERROR_MMAP_FAILED;
 		_dl_close(infile);
 		return NULL;
@@ -492,7 +492,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 					ppnt->p_offset & 0x7ffff000);
 
 				if (_dl_mmap_check_error(status)) {
-					_dl_fprintf(2, "%s: can't map '%s'\n", 
+					_dl_dprintf(2, "%s: can't map '%s'\n", 
 						_dl_progname, libname);
 					_dl_internal_error_number = DL_ERROR_MMAP_FAILED;
 					_dl_munmap((char *) libaddr, maxvma - minvma);
@@ -524,7 +524,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 					ppnt->p_filesz, LXFLAGS(ppnt->p_flags), flags, 
 					infile, ppnt->p_offset & 0x7ffff000);
 			if (_dl_mmap_check_error(status)) {
-				_dl_fprintf(2, "%s: can't map '%s'\n", _dl_progname, libname);
+				_dl_dprintf(2, "%s: can't map '%s'\n", _dl_progname, libname);
 				_dl_internal_error_number = DL_ERROR_MMAP_FAILED;
 				_dl_munmap((char *) libaddr, maxvma - minvma);
 				_dl_close(infile);
@@ -554,7 +554,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 
 	if (!dynamic_addr) {
 		_dl_internal_error_number = DL_ERROR_NODYNAMIC;
-		_dl_fprintf(2, "%s: '%s' is missing a dynamic section\n", 
+		_dl_dprintf(2, "%s: '%s' is missing a dynamic section\n", 
 			_dl_progname, libname);
 		return NULL;
 	}
diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index 56b18ceb8..621272bee 100644
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -74,7 +74,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 
 
 	if (reloc_type != R_386_JMP_SLOT) {
-		_dl_fprintf(2, "%s: Incorrect relocation type in jump relocations\n", 
+		_dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", 
 			_dl_progname);
 		_dl_exit(1);
 	};
@@ -85,7 +85,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	got_addr = (char **) instr_addr;
 
 #ifdef DEBUG
-	_dl_fprintf(2, "Resolving symbol %s\n", 
+	_dl_dprintf(2, "Resolving symbol %s\n", 
 		strtab + symtab[symtab_index].st_name);
 #endif
 
@@ -93,14 +93,14 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	new_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name, 
 		tpnt->symbol_scope, (unsigned long) got_addr, tpnt, 0);
 	if (!new_addr) {
-		_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+		_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 			_dl_progname, strtab + symtab[symtab_index].st_name);
 		_dl_exit(1);
 	};
 /* #define DEBUG_LIBRARY */
 #ifdef DEBUG_LIBRARY
 	if ((unsigned long) got_addr < 0x40000000) {
-		_dl_fprintf(2, "Calling library function: %s\n", 
+		_dl_dprintf(2, "Calling library function: %s\n", 
 			strtab + symtab[symtab_index].st_name);
 	} else {
 		*got_addr = new_addr;
@@ -150,13 +150,13 @@ void _dl_parse_lazy_relocation_information(struct elf_resolve *tpnt,
 			*reloc_addr += (unsigned long) tpnt->loadaddr;
 			break;
 		default:
-			_dl_fprintf(2, "%s: (LAZY) can't handle reloc type ", 
+			_dl_dprintf(2, "%s: (LAZY) can't handle reloc type ", 
 				_dl_progname);
 #ifdef VERBOSE_DLINKER
-			_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+			_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 			if (symtab_index)
-				_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 			_dl_exit(1);
 		};
 	};
@@ -209,7 +209,7 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 			 */
 			if (!symbol_addr &&
 				ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 					_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			}
@@ -233,20 +233,20 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 		case R_386_COPY:
 #if 0							
 			/* Do this later */
-			_dl_fprintf(2, "Doing copy for symbol ");
-			if (symtab_index) _dl_fprintf(2, strtab + symtab[symtab_index].st_name);
-			_dl_fprintf(2, "\n");
+			_dl_dprintf(2, "Doing copy for symbol ");
+			if (symtab_index) _dl_dprintf(2, strtab + symtab[symtab_index].st_name);
+			_dl_dprintf(2, "\n");
 			_dl_memcpy((void *) symtab[symtab_index].st_value, 
 				(void *) symbol_addr, symtab[symtab_index].st_size);
 #endif
 			break;
 		default:
-			_dl_fprintf(2, "%s: can't handle reloc type ", _dl_progname);
+			_dl_dprintf(2, "%s: can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-			_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+			_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 			if (symtab_index)
-				_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 			_dl_exit(1);
 		};
 
@@ -307,7 +307,7 @@ int _dl_parse_copy_information(struct dyn_elf *xpnt, unsigned long rel_addr,
 				symtab[symtab_index].st_name, xpnt->next, 
 				(unsigned long) reloc_addr, NULL, 1);
 			if (!symbol_addr) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 					_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			};
diff --git a/ldso/ldso/ld-uClibc.c b/ldso/ldso/ld-uClibc.c
deleted file mode 100644
index cbf6b1aae..000000000
--- a/ldso/ldso/ld-uClibc.c
+++ /dev/null
@@ -1,1309 +0,0 @@
-/* Run an ELF binary on a linux system.
-
-   Copyright (C) 1993-1996, Eric Youngdale.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-
-
-/* Program to load an ELF binary on a linux system, and run it.
- * References to symbols in sharable libraries can be resolved by
- * an ELF sharable library. */
-
-/* Disclaimer:  I have never seen any AT&T source code for SVr4, nor have
-   I ever taken any courses on internals.  This program was developed using
-   information available through the book "UNIX SYSTEM V RELEASE 4,
-   Programmers guide: Ansi C and Programming Support Tools", which did
-   a more than adequate job of explaining everything required to get this
-   working. */
-
-/*
- * The main trick with this program is that initially, we ourselves are not
- * dynamicly linked.  This means that we cannot access any global variables
- * since the GOT is initialized by the linker assuming a virtual address of 0,
- * and we cannot call any functions since the PLT is not initialized at all
- * (it will tend to want to call the dynamic linker
- *
- * There are further restrictions - we cannot use large switch statements,
- * since the compiler generates tables of addresses and jumps through them.
- * We can use inline functions, because these do not transfer control to
- * a new address, but they must be static so that they are not exported
- * from the modules.  We cannot use normal syscall stubs, because these
- * all reference the errno global variable which is not yet initialized.
- * We can use all of the local stack variables that we want, since these
- * are all referenced to %ebp or %esp.
- *
- * Life is further complicated by the fact that initially we do not want
- * to do a complete dynamic linking.  We want to allow the user to supply
- * new functions replacing some of the library versions, and until we have
- * the list of modules that we should search set up, we do not want to do
- * any of this.  Thus I have chosen to only perform the relocations for
- * variables that start with "_dl_" since ANSI specifies that the user is
- * not supposed to redefine any of these variables.
- *
- * Fortunately, the linker itself leaves a few clues lying around, and
- * when the kernel starts the image, there are a few further clues.
- * First of all, there is information buried on the stack that the kernel
- * leaves, which includes information about the load address that the
- * program interpreter was loaded at, the number of sections, the address
- * the application was loaded at and so forth.  Here this information
- * is stored in the array dl_info, and the indicies are taken from the
- * file /usr/include/sys/auxv.h on any SVr4 system.
- *
- * The linker itself leaves a pointer to the .dynamic section in the first
- * slot of the GOT, and as it turns out, %ebx points to ghe GOT when
- * you are using PIC code, so we just dereference this to get the address
- * of the dynamic sections.
- *
- * Typically you must load all text pages as writable so that dynamic linking
- * can succeed.  The kernel under SVr4 loads these as R/O, so we must call
- * mprotect to change the protections.  Once we are done, we should set these
- * back again, so the desired behavior is achieved.  Under linux there is
- * currently no mprotect function in the distribution kernel (although
- * someone has alpha patches), so for now everything is loaded writable.
- *
- * We do not have access to malloc and friends at the initial stages of dynamic
- * linking, and it would be handy to have some scratchpad memory available for
- * use as we set things up.  We mmap one page of scratch space, and have a
- * simple _dl_malloc that uses this memory.  This is a good thing, since we do
- * not want to use the same memory pool as malloc anyway - esp if the user
- * redefines malloc to do something funky.
- *
- * Our first task is to perform a minimal linking so that we can call other
- * portions of the dynamic linker.  Once we have done this, we then build
- * the list of modules that the application requires, using LD_LIBRARY_PATH
- * if this is not a suid program (/usr/lib otherwise).  Once this is done,
- * we can do the dynamic linking as required (and we must omit the things
- * we did to get the dynamic linker up and running in the first place.
- * After we have done this, we just have a few housekeeping chores and we
- * can transfer control to the user's application.
- */
-
-#include <stdarg.h>
-#include "sysdep.h" /* before elf.h to get ELF_USES_RELOCA right */
-#include <elf.h>
-#include "linuxelf.h"
-#include "hash.h"
-#include "syscall.h"
-#include "string.h"
-#include "../config.h"
-
-#define ALLOW_ZERO_PLTGOT
-
-/*  Some arches may need to override this in boot1_arch.h */
-#define	    ELFMAGIC	ELFMAG
-
-/* This is a poor man's malloc, used prior to resolving our internal poor man's malloc */
-#define DL_MALLOC(SIZE) ((void *) (malloc_buffer += SIZE, malloc_buffer - SIZE)) ;  REALIGN();
-/*
- * Make sure that the malloc buffer is aligned on 4 byte boundary.  For 64 bit
- * platforms we may need to increase this to 8, but this is good enough for
- * now.  This is typically called after DL_MALLOC.
- */
-#define REALIGN() malloc_buffer = (char *) (((unsigned long) malloc_buffer + 3) & ~(3))
-
-static char *_dl_malloc_addr, *_dl_mmap_zero;
-char *_dl_library_path = 0;		/* Where we look for libraries */
-char *_dl_preload = 0;			/* Things to be loaded before the libs. */
-#include "ld.so.h"			/* Pull in the name of ld.so */
-const char *_dl_progname=_dl_static_progname;
-static char *_dl_not_lazy = 0;
-#ifdef DL_TRACE
-static char *_dl_trace_loaded_objects = 0;
-#endif
-static int (*_dl_elf_main) (int, char **, char **);
-static int (*_dl_elf_init) (void);
-void *(*_dl_malloc_function) (int size) = NULL;
-struct r_debug *_dl_debug_addr = NULL;
-unsigned long *_dl_brkp;
-unsigned long *_dl_envp;
-char *_dl_getenv(char *symbol, char **envp);
-void _dl_unsetenv(char *symbol, char **envp);
-int _dl_fixup(struct elf_resolve *tpnt);
-void _dl_debug_state(void);
-char *_dl_get_last_path_component(char *path);
-
-#include "boot1_arch.h"
-
-
-/* When we enter this piece of code, the program stack looks like this:
-        argc            argument counter (integer)
-        argv[0]         program name (pointer)
-        argv[1...N]     program args (pointers)
-        argv[argc-1]    end of args (integer)
-	NULL
-        env[0...N]      environment variables (pointers)
-        NULL
-	auxv_t[0...N]   Auxiliary Vector Table elements (mixed types)
-*/
-
-DL_BOOT(unsigned long args)
-{
-	unsigned int argc;
-	char **argv, **envp;
-	unsigned long load_addr;
-	unsigned long *got;
-	unsigned long *aux_dat;
-	int goof = 0;
-	elfhdr *header;
-	struct elf_resolve *tpnt;
-	struct dyn_elf *rpnt;
-	struct elf_resolve *app_tpnt;
-	unsigned long brk_addr;
-	Elf32_auxv_t auxv_t[AT_EGID + 1];
-	unsigned char *malloc_buffer, *mmap_zero;
-	int (*_dl_atexit) (void *);
-	unsigned long *lpnt;
-	Elf32_Dyn *dpnt;
-	unsigned long *hash_addr;
-	struct r_debug *debug_addr;
-	unsigned long *chains;
-	int indx;
-	int _dl_secure;
-	int status;
-
-
-	/* WARNING! -- we cannot make _any_ funtion calls until we have
-	 * taken care of fixing up our own relocations.  Making static
-	 * lnline calls is ok, but _no_ function calls.  Not yet
-	 * anyways. */
-
-	/* First obtain the information on the stack that tells us more about
-	   what binary is loaded, where it is loaded, etc, etc */
-	GET_ARGV(aux_dat,args);
-#if defined(__arm__)
-	aux_dat+=1;
-#endif	
-	argc = *(aux_dat - 1);
-        argv = (char **) aux_dat;
-	aux_dat += argc;			/* Skip over the argv pointers */
-	aux_dat++;				/* Skip over NULL at end of argv */
-	envp = (char **) aux_dat;
-	while (*aux_dat)
-		aux_dat++;			/* Skip over the envp pointers */
-	aux_dat++;				/* Skip over NULL at end of envp */
-
-	/* Place -1 here as a checkpoint.  We later check if it was changed
-	 * when we read in the auxv_t */
-	auxv_t[AT_UID].a_type = -1;
-	
-	/* The junk on the stack immediately following the environment is  
-	 * the Auxiliary Vector Table.  Read out the elements of the auxv_t,
-	 * sort and store them in auxv_t for later use. */
-	while (*aux_dat) 
-	{
-		Elf32_auxv_t *auxv_entry = (Elf32_auxv_t*) aux_dat;
-
-		if (auxv_entry->a_type <= AT_EGID) {
-			_dl_memcpy_inline(&(auxv_t[auxv_entry->a_type]), 
-				auxv_entry, sizeof(Elf32_auxv_t));
-		}
-		aux_dat += 2;
-	}
-	
-	/* locate the ELF header.   We need this done as soon as possible 
-	 * (esp since SEND_STDERR() needs this on some platforms... */
-	load_addr = auxv_t[AT_BASE].a_un.a_val;
-	header = (elfhdr *) auxv_t[AT_BASE].a_un.a_ptr;
-
-	/* Check the ELF header to make sure everything looks ok.  */
-	if (! header || header->e_ident[EI_CLASS] != ELFCLASS32 ||
-		header->e_ident[EI_VERSION] != EV_CURRENT || 
-		_dl_strncmp_inline((void *)header, ELFMAGIC, SELFMAG) != 0)
-	{
-	    SEND_STDERR("Invalid ELF header\n");
-	    _dl_exit(0);
-	}
-#ifdef DL_DEBUG
-	SEND_STDERR("ELF header =");
-	SEND_ADDRESS_STDERR(load_addr, 1);
-#endif	
-
-
-	/* Locate the global offset table.  Since this code must be PIC  
-	 * we can take advantage of the magic offset register, if we
-	 * happen to know what that is for this architecture.  If not,
-	 * we can always read stuff out of the ELF file to find it... */
-#if defined(__i386__)
-	__asm__("\tmovl %%ebx,%0\n\t" : "=a" (got));
-#elif defined(__m68k__)
-	__asm__ ("movel %%a5,%0" : "=g" (got))
-#elif defined(__sparc__)
-	__asm__("\tmov %%l7,%0\n\t" : "=r" (got))
-#elif defined(__arm__)
-	__asm__("\tmov %0, r10\n\t" : "=r"(got));
-#elif defined(__powerpc__)
-	__asm__("\tbl _GLOBAL_OFFSET_TABLE_-4@local\n\t" : "=l"(got));
-#else
-	/* Do things the slow way in C */
-	{
-	    unsigned long tx_reloc;
-	    Elf32_Dyn *dynamic=NULL;
-	    Elf32_Shdr *shdr;
-	    Elf32_Phdr *pt_load;
-
-#ifdef DL_DEBUG
-	    SEND_STDERR("Finding the got using C code to read the ELF file\n");
-#endif	
-	    /* Find where the dynamic linking information section is hiding */
-	    shdr = (Elf32_Shdr *)(header->e_shoff + (char *)header);
-	    for (indx = header->e_shnum; --indx>=0; ++shdr) {
-		if (shdr->sh_type == SHT_DYNAMIC) {
-		    goto found_dynamic;
-		}
-	    }
-	    SEND_STDERR("missing dynamic linking information section \n");
-	    _dl_exit(0);
-
-found_dynamic:
-	    dynamic = (Elf32_Dyn*)(shdr->sh_offset + (char *)header);
-
-	    /* Find where PT_LOAD is hiding */
-	    pt_load = (Elf32_Phdr *)(header->e_phoff + (char *)header);
-	    for (indx = header->e_phnum; --indx>=0; ++pt_load) {
-		if (pt_load->p_type == PT_LOAD) {
-		    goto found_pt_load;
-		}
-	    }
-	    SEND_STDERR("missing loadable program segment\n");
-	    _dl_exit(0);
-
-found_pt_load:
-	    /* Now (finally) find where DT_PLTGOT is hiding */
-	    tx_reloc = pt_load->p_vaddr - pt_load->p_offset;
-	    for (; DT_NULL!=dynamic->d_tag; ++dynamic) {
-		if (dynamic->d_tag == DT_PLTGOT) {
-		    goto found_got;
-		}       
-	    }       
-	    SEND_STDERR("missing global offset table\n");
-	    _dl_exit(0);
-
-found_got:
-	    got = (unsigned long *)(dynamic->d_un.d_val - tx_reloc + (char *)header );
-	}
-#endif
-
-	/* Now, finally, fix up the location of the dynamic stuff */
-	dpnt = (Elf32_Dyn *) (*got + load_addr);
-#ifdef DL_DEBUG
-	SEND_STDERR("First Dynamic section entry=");
-	SEND_ADDRESS_STDERR(dpnt, 1);
-#endif	
-
-	
-	/* Call mmap to get a page of writable memory that can be used 
-	 * for _dl_malloc throughout the shared lib loader. */
-	mmap_zero = malloc_buffer = _dl_mmap((void *) 0, 4096, 
-		PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-	if (_dl_mmap_check_error(mmap_zero)) {
-	    SEND_STDERR("dl_boot: mmap of a spare page failed!\n");
-	    _dl_exit(13);
-	}
-
-	tpnt = DL_MALLOC(sizeof(struct elf_resolve));
-	_dl_memset_inline(tpnt, 0, sizeof(*tpnt));
-	app_tpnt = DL_MALLOC(sizeof(struct elf_resolve));
-	_dl_memset_inline(app_tpnt, 0, sizeof(*app_tpnt));
-
-	/*
-	 * This is used by gdb to locate the chain of shared libraries that are currently loaded.
-	 */
-	debug_addr = DL_MALLOC(sizeof(struct r_debug));
-	_dl_memset_inline(debug_addr, 0, sizeof(*debug_addr));
-
-	/* OK, that was easy.  Next scan the DYNAMIC section of the image.
-	   We are only doing ourself right now - we will have to do the rest later */
-
-	while (dpnt->d_tag) {
-		tpnt->dynamic_info[dpnt->d_tag] = dpnt->d_un.d_val;
-		if (dpnt->d_tag == DT_TEXTREL || SVR4_BUGCOMPAT)
-			tpnt->dynamic_info[DT_TEXTREL] = 1;
-		dpnt++;
-	}
-
-	{
-		elf_phdr *ppnt;
-		int i;
-
-		ppnt = (elf_phdr *) auxv_t[AT_PHDR].a_un.a_ptr;
-		for (i = 0; i < auxv_t[AT_PHNUM].a_un.a_val; i++, ppnt++)
-			if (ppnt->p_type == PT_DYNAMIC) {
-				dpnt = (Elf32_Dyn *) ppnt->p_vaddr;
-				while (dpnt->d_tag) {
-					if (dpnt->d_tag > DT_JMPREL) {
-						dpnt++;
-						continue;
-					}
-					app_tpnt->dynamic_info[dpnt->d_tag] = dpnt->d_un.d_val;
-					if (dpnt->d_tag == DT_DEBUG)
-						dpnt->d_un.d_val = (unsigned long) debug_addr;
-					if (dpnt->d_tag == DT_TEXTREL || SVR4_BUGCOMPAT)
-						app_tpnt->dynamic_info[DT_TEXTREL] = 1;
-					dpnt++;
-				}
-			}
-	}
-
-	/* Get some more of the information that we will need to dynamicly link
-	   this module to itself */
-
-	hash_addr = (unsigned long *) (tpnt->dynamic_info[DT_HASH] + load_addr);
-	tpnt->nbucket = *hash_addr++;
-	tpnt->nchain = *hash_addr++;
-	tpnt->elf_buckets = hash_addr;
-	hash_addr += tpnt->nbucket;
-	chains = hash_addr;
-
-	/* Ugly, ugly.  We need to call mprotect to change the protection of
-	   the text pages so that we can do the dynamic linking.  We can set the
-	   protection back again once we are done */
-
-	{
-		elf_phdr *ppnt;
-		int i;
-
-		/* First cover the shared library/dynamic linker. */
-		if (tpnt->dynamic_info[DT_TEXTREL]) {
-			header = (elfhdr *) auxv_t[AT_BASE].a_un.a_ptr;
-			ppnt = (elf_phdr *) (auxv_t[AT_BASE].a_un.a_ptr + header->e_phoff);
-			for (i = 0; i < header->e_phnum; i++, ppnt++) {
-				if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W))
-					_dl_mprotect((void *) (load_addr + (ppnt->p_vaddr & 0xfffff000)), 
-						(ppnt->p_vaddr & 0xfff) + (unsigned long) ppnt->p_filesz, 
-						PROT_READ | PROT_WRITE | PROT_EXEC);
-			}
-		}
-
-		/* Now cover the application program. */
-		if (app_tpnt->dynamic_info[DT_TEXTREL]) {
-			ppnt = (elf_phdr *) auxv_t[AT_PHDR].a_un.a_ptr;
-			for (i = 0; i < auxv_t[AT_PHNUM].a_un.a_val; i++, ppnt++) {
-				if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W))
-					_dl_mprotect((void *) (ppnt->p_vaddr & 0xfffff000), 
-						(ppnt->p_vaddr & 0xfff) + 
-						(unsigned long) ppnt->p_filesz, 
-						PROT_READ | PROT_WRITE | PROT_EXEC);
-			}
-		}
-	}
-
-	/* OK, now do the relocations.  We do not do a lazy binding here, so
-	   that once we are done, we have considerably more flexibility. */
-
-	goof = 0;
-	for (indx = 0; indx < 2; indx++) {
-		int i;
-		ELF_RELOC *rpnt;
-		unsigned long *reloc_addr;
-		unsigned long symbol_addr;
-		int symtab_index;
-		unsigned long rel_addr, rel_size;
-
-
-#ifdef ELF_USES_RELOCA
-		rel_addr =
-			(indx ? tpnt->dynamic_info[DT_JMPREL] : tpnt->
-			 dynamic_info[DT_RELA]);
-		rel_size =
-			(indx ? tpnt->dynamic_info[DT_PLTRELSZ] : tpnt->
-			 dynamic_info[DT_RELASZ]);
-#else
-		rel_addr =
-			(indx ? tpnt->dynamic_info[DT_JMPREL] : tpnt->
-			 dynamic_info[DT_REL]);
-		rel_size =
-			(indx ? tpnt->dynamic_info[DT_PLTRELSZ] : tpnt->
-			 dynamic_info[DT_RELSZ]);
-#endif
-
-
-		if (!rel_addr)
-			continue;
-
-		/* Now parse the relocation information */
-		rpnt = (ELF_RELOC *) (rel_addr + load_addr);
-		for (i = 0; i < rel_size; i += sizeof(ELF_RELOC), rpnt++) {
-			reloc_addr = (unsigned long *) (load_addr + (unsigned long) rpnt->r_offset);
-			symtab_index = ELF32_R_SYM(rpnt->r_info);
-			symbol_addr = 0;
-			if (symtab_index) {
-				char *strtab;
-				Elf32_Sym *symtab;
-
-				symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + load_addr);
-				strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + load_addr);
-
-				/* We only do a partial dynamic linking right now.  The user
-				   is not supposed to redefine any symbols that start with
-				   a '_', so we can do this with confidence. */
-
-				if (!_dl_symbol(strtab + symtab[symtab_index].st_name))
-					continue;
-
-				symbol_addr = load_addr + symtab[symtab_index].st_value;
-
-				if (!symbol_addr) {
-					/*
-					 * This will segfault - you cannot call a function until
-					 * we have finished the relocations.
-					 */
-					SEND_STDERR("ELF dynamic loader - unable to "
-						"self-bootstrap - symbol ");
-					SEND_STDERR(strtab + symtab[symtab_index].st_name);
-					SEND_STDERR(" undefined.\n");
-					goof++;
-				}
-			}
-			/*
-			 * Use this machine-specific macro to perform the actual relocation.
-			 */
-			PERFORM_BOOTSTRAP_RELOC(rpnt, reloc_addr, symbol_addr, load_addr);
-		}
-	}
-
-	if (goof) {
-		_dl_exit(14);
-	}
-
-	/* OK, at this point we have a crude malloc capability.  Start to build
-	   the tables of the modules that are required for this beast to run.
-	   We start with the basic executable, and then go from there.  Eventually
-	   we will run across ourself, and we will need to properly deal with that
-	   as well. */
-	_dl_malloc_addr = malloc_buffer;
-	_dl_mmap_zero = mmap_zero;
-
-	/* Now we have done the mandatory linking of some things.  We are now
-	   free to start using global variables, since these things have all been
-	   fixed up by now.  Still no function calls outside of this library ,
-	   since the dynamic resolver is not yet ready. */
-	lpnt = (unsigned long *) (tpnt->dynamic_info[DT_PLTGOT] + load_addr);
-	INIT_GOT(lpnt, tpnt);
-
-	/* OK, this was a big step, now we need to scan all of the user images
-	   and load them properly. */
-
-	tpnt->next = 0;
-	tpnt->libname = 0;
-	tpnt->libtype = program_interpreter;
-
-	{
-		elfhdr *epnt;
-		elf_phdr *ppnt;
-		int i;
-
-		epnt = (elfhdr *) auxv_t[AT_BASE].a_un.a_ptr;
-		tpnt->n_phent = epnt->e_phnum;
-		tpnt->ppnt = ppnt = (elf_phdr *) (load_addr + epnt->e_phoff);
-		for (i = 0; i < epnt->e_phnum; i++, ppnt++) {
-			if (ppnt->p_type == PT_DYNAMIC) {
-				tpnt->dynamic_addr = ppnt->p_vaddr + load_addr;
-				tpnt->dynamic_size = ppnt->p_filesz;
-			}
-		}
-	}
-
-	tpnt->chains = chains;
-	tpnt->loadaddr = (char *) load_addr;
-
-	brk_addr = 0;
-	rpnt = NULL;
-
-	/* At this point we are now free to examine the user application,
-	   and figure out which libraries are supposed to be called.  Until
-	   we have this list, we will not be completely ready for dynamic linking */
-
-	{
-		elf_phdr *ppnt;
-		int i;
-
-		ppnt = (elf_phdr *) auxv_t[AT_PHDR].a_un.a_ptr;
-		for (i = 0; i < auxv_t[AT_PHNUM].a_un.a_val; i++, ppnt++) {
-			if (ppnt->p_type == PT_LOAD) {
-				if (ppnt->p_vaddr + ppnt->p_memsz > brk_addr)
-					brk_addr = ppnt->p_vaddr + ppnt->p_memsz;
-			}
-			if (ppnt->p_type == PT_DYNAMIC) {
-#ifndef ALLOW_ZERO_PLTGOT
-				/* make sure it's really there. */
-				if (app_tpnt->dynamic_info[DT_PLTGOT] == 0)
-					continue;
-#endif
-				/* OK, we have what we need - slip this one into the list. */
-				app_tpnt = _dl_add_elf_hash_table("", 0, 
-					app_tpnt->dynamic_info, ppnt->p_vaddr, ppnt->p_filesz);
-				_dl_loaded_modules->libtype = elf_executable;
-				_dl_loaded_modules->ppnt = (elf_phdr *) auxv_t[AT_PHDR].a_un.a_ptr;
-				_dl_loaded_modules->n_phent = auxv_t[AT_PHNUM].a_un.a_val;
-				_dl_symbol_tables = rpnt = (struct dyn_elf *) _dl_malloc(sizeof(struct dyn_elf));
-				_dl_memset(rpnt, 0, sizeof(*rpnt));
-				rpnt->dyn = _dl_loaded_modules;
-				app_tpnt->usage_count++;
-				app_tpnt->symbol_scope = _dl_symbol_tables;
-				lpnt = (unsigned long *) (app_tpnt->dynamic_info[DT_PLTGOT]);
-#ifdef ALLOW_ZERO_PLTGOT
-				if (lpnt)
-#endif
-					INIT_GOT(lpnt, _dl_loaded_modules);
-			}
-			if (ppnt->p_type == PT_INTERP) {	/* OK, fill this in - we did not 
-								   have this before */
-				tpnt->libname = _dl_strdup((char *) ppnt->p_offset +
-							   (auxv_t[AT_PHDR].a_un.a_val & 0xfffff000));
-			}
-		}
-	}
-
-	if (argv[0]) {
-		_dl_progname = argv[0];
-	}
-
-	/* Now we need to figure out what kind of options are selected.
-	   Note that for SUID programs we ignore the settings in LD_LIBRARY_PATH */
-	{
-		_dl_not_lazy = _dl_getenv("LD_BIND_NOW", envp);
-
-		if ((auxv_t[AT_UID].a_un.a_val == -1 && _dl_suid_ok()) ||
-			(auxv_t[AT_UID].a_un.a_val != -1 && 
-			 auxv_t[AT_UID].a_un.a_val == auxv_t[AT_EUID].a_un.a_val
-			 && auxv_t[AT_GID].a_un.a_val== auxv_t[AT_EGID].a_un.a_val)) {
-			_dl_secure = 0;
-			_dl_preload = _dl_getenv("LD_PRELOAD", envp);
-			_dl_library_path = _dl_getenv("LD_LIBRARY_PATH", envp);
-		} else {
-			_dl_secure = 1;
-			_dl_preload = _dl_getenv("LD_PRELOAD", envp);
-			_dl_unsetenv("LD_AOUT_PRELOAD", envp);
-			_dl_unsetenv("LD_LIBRARY_PATH", envp);
-			_dl_unsetenv("LD_AOUT_LIBRARY_PATH", envp);
-			_dl_library_path = NULL;
-		}
-	}
-
-#ifdef DL_TRACE
-	_dl_trace_loaded_objects = _dl_getenv("LD_TRACE_LOADED_OBJECTS", envp);
-#endif
-	/* OK, we now have the application in the list, and we have some
-	   basic stuff in place.  Now search through the list for other shared
-	   libraries that should be loaded, and insert them on the list in the
-	   correct order. */
-
-#ifdef USE_CACHE
-	_dl_map_cache();
-#endif
-
-	{
-		struct elf_resolve *tcurr;
-		struct elf_resolve *tpnt1;
-		char *lpnt;
-
-		if (_dl_preload) 
-		{
-			char c, *str, *str2;
-
-			str = _dl_preload;
-			while (*str == ':' || *str == ' ' || *str == '\t')
-				str++;
-			while (*str) 
-			{
-				str2 = str;
-				while (*str2 && *str2 != ':' && *str2 != ' ' && *str2 != '\t')
-					str2++;
-				c = *str2;
-				*str2 = '\0';
-				if (!_dl_secure || _dl_strchr(str, '/') == NULL) 
-				{
-					tpnt1 = _dl_load_shared_library(_dl_secure, NULL, str);
-					if (!tpnt1) {
-#ifdef DL_TRACE
-						if (_dl_trace_loaded_objects)
-							_dl_fprintf(1, "\t%s => not found\n", str);
-						else {
-#endif
-							_dl_fprintf(2, "%s: can't load "
-								"library '%s'\n", _dl_progname, str);
-							_dl_exit(15);
-#ifdef DL_TRACE
-						}
-#endif
-					} else {
-#ifdef DL_TRACE
-						if (_dl_trace_loaded_objects
-							&& !tpnt1->usage_count) {
-							/* this is a real hack to make ldd not print 
-							 * the library itself when run on a library. */
-							if (_dl_strcmp(_dl_progname, str) != 0)
-								_dl_fprintf(1, "\t%s => %s (0x%x)\n", str, tpnt1->libname, 
-									(unsigned) tpnt1->loadaddr);
-						}
-#endif
-						rpnt->next = (struct dyn_elf *)
-							_dl_malloc(sizeof(struct dyn_elf));
-						_dl_memset(rpnt->next, 0, sizeof(*(rpnt->next)));
-						rpnt = rpnt->next;
-						tpnt1->usage_count++;
-						tpnt1->symbol_scope = _dl_symbol_tables;
-						tpnt1->libtype = elf_lib;
-						rpnt->dyn = tpnt1;
-					}
-				}
-				*str2 = c;
-				str = str2;
-				while (*str == ':' || *str == ' ' || *str == '\t')
-					str++;
-			}
-		}
-
-		{
-			int fd;
-			struct stat st;
-			char *preload;
-
-			if (!_dl_stat(LDSO_PRELOAD, &st)) {
-				if ((fd = _dl_open(LDSO_PRELOAD, O_RDONLY)) < 0) {
-					_dl_fprintf(2, "%s: can't open file '%s'\n", 
-						_dl_progname, LDSO_PRELOAD);
-				} else {
-					preload = (caddr_t) _dl_mmap(0, st.st_size + 1, 
-						PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-					_dl_close(fd);
-					if (preload == (caddr_t) - 1) {
-						_dl_fprintf(2, "%s: can't map file '%s'\n", 
-							_dl_progname, LDSO_PRELOAD);
-					} else {
-						char c, *cp, *cp2;
-
-						/* convert all separators and comments to spaces */
-						for (cp = preload; *cp; /*nada */ ) {
-							if (*cp == ':' || *cp == '\t' || *cp == '\n') {
-								*cp++ = ' ';
-							} else if (*cp == '#') {
-								do
-									*cp++ = ' ';
-								while (*cp != '\n' && *cp != '\0');
-							} else {
-								cp++;
-							}
-						}
-
-						/* find start of first library */
-						for (cp = preload; *cp && *cp == ' '; cp++)
-							/*nada */ ;
-
-						while (*cp) {
-							/* find end of library */
-							for (cp2 = cp; *cp && *cp != ' '; cp++)
-								/*nada */ ;
-							c = *cp;
-							*cp = '\0';
-
-							tpnt1 = _dl_load_shared_library(0, NULL, cp2);
-							if (!tpnt1) {
-#ifdef DL_TRACE
-								if (_dl_trace_loaded_objects)
-									_dl_fprintf(1, "\t%s => not found\n", cp2);
-								else {
-#endif
-									_dl_fprintf(2, "%s: can't load library '%s'\n", 
-										_dl_progname, cp2);
-									_dl_exit(15);
-#ifdef DL_TRACE
-						}
-#endif
-							} else {
-#ifdef DL_TRACE
-								if (_dl_trace_loaded_objects
-									&& !tpnt1->usage_count) {
-									_dl_fprintf(1, "\t%s => %s (0x%x)\n", cp2, 
-										tpnt1->libname, (unsigned) tpnt1->loadaddr);
-								}
-#endif
-								rpnt->next = (struct dyn_elf *)
-									_dl_malloc(sizeof(struct dyn_elf));
-								_dl_memset(rpnt->next, 0, 
-									sizeof(*(rpnt->next)));
-								rpnt = rpnt->next;
-								tpnt1->usage_count++;
-								tpnt1->symbol_scope = _dl_symbol_tables;
-								tpnt1->libtype = elf_lib;
-								rpnt->dyn = tpnt1;
-							}
-
-							/* find start of next library */
-							*cp = c;
-							for ( /*nada */ ; *cp && *cp == ' '; cp++)
-								/*nada */ ;
-						}
-
-						_dl_munmap(preload, st.st_size + 1);
-					}
-				}
-			}
-		}
-
-		for (tcurr = _dl_loaded_modules; tcurr; tcurr = tcurr->next) {
-			for (dpnt = (Elf32_Dyn *) tcurr->dynamic_addr; dpnt->d_tag;
-				 dpnt++) {
-				if (dpnt->d_tag == DT_NEEDED) {
-					lpnt = tcurr->loadaddr + tcurr->dynamic_info[DT_STRTAB] +
-						dpnt->d_un.d_val;
-					if (tpnt && _dl_strcmp(lpnt, 
-						    _dl_get_last_path_component(tpnt->libname)) == 0) {
-						struct elf_resolve *ttmp;
-
-#ifdef DL_TRACE
-						if (_dl_trace_loaded_objects && !tpnt->usage_count) {
-						    _dl_fprintf(1, "\t%s => %s (0x%x)\n", 
-							    lpnt, tpnt->libname, (unsigned) tpnt->loadaddr);
-						}
-#endif
-						ttmp = _dl_loaded_modules;
-						while (ttmp->next)
-							ttmp = ttmp->next;
-						ttmp->next = tpnt;
-						tpnt->prev = ttmp;
-						tpnt->next = NULL;
-						rpnt->next = (struct dyn_elf *)
-							_dl_malloc(sizeof(struct dyn_elf));
-						_dl_memset(rpnt->next, 0, sizeof(*(rpnt->next)));
-						rpnt = rpnt->next;
-						rpnt->dyn = tpnt;
-						tpnt->usage_count++;
-						tpnt->symbol_scope = _dl_symbol_tables;
-						tpnt = NULL;
-						continue;
-					}
-					if (!(tpnt1 = _dl_load_shared_library(0, tcurr, lpnt))) {
-#ifdef DL_TRACE
-						if (_dl_trace_loaded_objects)
-							_dl_fprintf(1, "\t%s => not found\n", lpnt);
-						else {
-#endif
-							_dl_fprintf(2, "%s: can't load library '%s'\n", 
-								_dl_progname, lpnt);
-							_dl_exit(16);
-#ifdef DL_TRACE
-						}
-#endif
-					} else {
-#ifdef DL_TRACE
-						if (_dl_trace_loaded_objects && !tpnt1->usage_count)
-							_dl_fprintf(1, "\t%s => %s (0x%x)\n", lpnt, tpnt1->libname, 
-								(unsigned) tpnt1->loadaddr);
-#endif
-						rpnt->next = (struct dyn_elf *)
-							_dl_malloc(sizeof(struct dyn_elf));
-						_dl_memset(rpnt->next, 0, sizeof(*(rpnt->next)));
-						rpnt = rpnt->next;
-						tpnt1->usage_count++;
-						tpnt1->symbol_scope = _dl_symbol_tables;
-						tpnt1->libtype = elf_lib;
-						rpnt->dyn = tpnt1;
-					}
-				}
-			}
-		}
-	}
-
-#ifdef USE_CACHE
-	_dl_unmap_cache();
-#endif
-	/* ldd uses uses this.  I am not sure how you pick up the other flags */
-#ifdef DL_TRACE
-	if (_dl_trace_loaded_objects) {
-		char *_dl_warn = 0;
-		_dl_warn = _dl_getenv("LD_WARN", envp);
-		if (!_dl_warn)
-			_dl_exit(0);
-	}
-#endif
-
-	/*
-	 * If the program interpreter is not in the module chain, add it.  This will
-	 * be required for dlopen to be able to access the internal functions in the 
-	 * dynamic linker.
-	 */
-	if (tpnt) {
-		struct elf_resolve *tcurr;
-
-		tcurr = _dl_loaded_modules;
-		if (tcurr)
-			while (tcurr->next)
-				tcurr = tcurr->next;
-		tpnt->next = NULL;
-		tpnt->usage_count++;
-
-		if (tcurr) {
-			tcurr->next = tpnt;
-			tpnt->prev = tcurr;
-		} else {
-			_dl_loaded_modules = tpnt;
-			tpnt->prev = NULL;
-		}
-		if (rpnt) {
-			rpnt->next = (struct dyn_elf *) _dl_malloc(sizeof(struct dyn_elf));
-			_dl_memset(rpnt->next, 0, sizeof(*(rpnt->next)));
-			rpnt = rpnt->next;
-		} else {
-			rpnt = (struct dyn_elf *) _dl_malloc(sizeof(struct dyn_elf));
-			_dl_memset(rpnt, 0, sizeof(*(rpnt->next)));
-		}
-		rpnt->dyn = tpnt;
-		tpnt = NULL;
-	}
-
-	/*
-	 * OK, now all of the kids are tucked into bed in their proper addresses.
-	 * Now we go through and look for REL and RELA records that indicate fixups
-	 * to the GOT tables.  We need to do this in reverse order so that COPY
-	 * directives work correctly */
-	goof = _dl_loaded_modules ? _dl_fixup(_dl_loaded_modules) : 0;
-
-
-	/* Some flavors of SVr4 do not generate the R_*_COPY directive,
-	   and we have to manually search for entries that require fixups. 
-	   Solaris gets this one right, from what I understand.  */
-
-	if (_dl_symbol_tables)
-		goof += _dl_copy_fixups(_dl_symbol_tables);
-#ifdef DL_TRACE
-	if (goof || _dl_trace_loaded_objects)
-		_dl_exit(0);
-#endif
-
-	/* OK, at this point things are pretty much ready to run.  Now we
-	   need to touch up a few items that are required, and then
-	   we can let the user application have at it.  Note that
-	   the dynamic linker itself is not guaranteed to be fully
-	   dynamicly linked if we are using ld.so.1, so we have to look
-	   up each symbol individually. */
-
-
-	_dl_brkp = (unsigned long *) _dl_find_hash("___brk_addr", NULL, 1, NULL, 0);
-	if (_dl_brkp)
-		*_dl_brkp = brk_addr;
-	_dl_envp =
-		(unsigned long *) _dl_find_hash("__environ", NULL, 1, NULL, 0);
-
-	if (_dl_envp)
-		*_dl_envp = (unsigned long) envp;
-	{
-		int i;
-		elf_phdr *ppnt;
-
-		/* We had to set the protections of all pages to R/W for dynamic linking.
-		   Set text pages back to R/O */
-		for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next)
-			for (ppnt = tpnt->ppnt, i = 0; i < tpnt->n_phent; i++, ppnt++)
-				if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W) &&
-					tpnt->dynamic_info[DT_TEXTREL])
-					_dl_mprotect((void *) (tpnt->loadaddr + (ppnt->p_vaddr & 0xfffff000)), 
-						(ppnt->p_vaddr & 0xfff) + (unsigned long) ppnt->p_filesz, 
-						LXFLAGS(ppnt->p_flags));
-
-	}
-
-	_dl_atexit = (int (*)(void *)) _dl_find_hash("atexit", NULL, 1, NULL, 0);
-
-	/*
-	 * OK, fix one more thing - set up the debug_addr structure to point
-	 * to our chain.  Later we may need to fill in more fields, but this
-	 * should be enough for now.
-	 */
-	debug_addr->r_map = (struct link_map *) _dl_loaded_modules;
-	debug_addr->r_version = 1;
-	debug_addr->r_ldbase = load_addr;
-	debug_addr->r_brk = (unsigned long) &_dl_debug_state;
-	_dl_debug_addr = debug_addr;
-	debug_addr->r_state = RT_CONSISTENT;
-	/* This is written in this funny way to keep gcc from inlining the
-	   function call. */
-	((void (*)(void)) debug_addr->r_brk) ();
-
-	for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next) {
-		/* Apparently crt1 for the application is responsible for handling this.
-		 * We only need to run the init/fini for shared libraries
-		 */
-		if (tpnt->libtype == program_interpreter ||
-			tpnt->libtype == elf_executable)
-			continue;
-		if (tpnt->init_flag & INIT_FUNCS_CALLED)
-			continue;
-		tpnt->init_flag |= INIT_FUNCS_CALLED;
-
-		if (tpnt->dynamic_info[DT_INIT]) {
-			_dl_elf_init = (int (*)(void)) (tpnt->loadaddr + 
-				tpnt->dynamic_info[DT_INIT]);
-			(*_dl_elf_init) ();
-		}
-		if (_dl_atexit && tpnt->dynamic_info[DT_FINI]) {
-			(*_dl_atexit) (tpnt->loadaddr + tpnt->dynamic_info[DT_FINI]);
-		}
-#undef DL_DEBUG
-#ifdef DL_DEBUG
-		else {
-			_dl_fprintf(2, tpnt->libname);
-			_dl_fprintf(2, ": ");
-			if (!_dl_atexit)
-				_dl_fprintf(2, "The address is atexit () is 0x0.");
-			if (!tpnt->dynamic_info[DT_FINI])
-				_dl_fprintf(2, "Invalid .fini section.");
-			_dl_fprintf(2, "\n");
-		}
-#endif
-#undef DL_DEBUG
-	}
-
-	/* OK we are done here.  Turn out the lights, and lock up. */
-	_dl_elf_main = (int (*)(int, char **, char **)) auxv_t[AT_ENTRY].a_un.a_fcn;
-
-
-	/*
-	 * Transfer control to the application.
-	 */
-	status = 0; /* Used on x86, but not on other arches */
-	START();
-}
-
-/*
- * This stub function is used by some debuggers.  The idea is that they
- * can set an internal breakpoint on it, so that we are notified when the
- * address mapping is changed in some way.
- */
-void _dl_debug_state()
-{
-	return;
-}
-
-int _dl_fixup(struct elf_resolve *tpnt)
-{
-	int goof = 0;
-	
-	if (tpnt->next)
-		goof += _dl_fixup(tpnt->next);
-	if (tpnt->dynamic_info[DT_REL]) {
-#ifdef ELF_USES_RELOCA
-		_dl_fprintf(2, "%s: can't handle REL relocation records\n", 
-			_dl_progname);
-		_dl_exit(17);
-#else
-		if (tpnt->init_flag & RELOCS_DONE)
-			return goof;
-		tpnt->init_flag |= RELOCS_DONE;
-		goof += _dl_parse_relocation_information(tpnt, 
-			tpnt->dynamic_info[DT_REL], tpnt->dynamic_info[DT_RELSZ], 0);
-#endif
-	}
-	if (tpnt->dynamic_info[DT_RELA]) {
-#ifdef ELF_USES_RELOCA
-		if (tpnt->init_flag & RELOCS_DONE)
-			return goof;
-		tpnt->init_flag |= RELOCS_DONE;
-		goof += _dl_parse_relocation_information(tpnt, 
-			tpnt->dynamic_info[DT_RELA], tpnt->dynamic_info[DT_RELASZ], 0);
-#else
-		_dl_fprintf(2, "%s: can't handle RELA relocation records\n", 
-			_dl_progname);
-		_dl_exit(18);
-#endif
-	}
-	if (tpnt->dynamic_info[DT_JMPREL]) {
-		if (tpnt->init_flag & JMP_RELOCS_DONE)
-			return goof;
-		tpnt->init_flag |= JMP_RELOCS_DONE;
-		if (!_dl_not_lazy || *_dl_not_lazy == 0)
-			_dl_parse_lazy_relocation_information(tpnt, 
-				tpnt->dynamic_info[DT_JMPREL], tpnt->dynamic_info[DT_PLTRELSZ], 0);
-		else
-			goof += _dl_parse_relocation_information(tpnt, 
-				tpnt->dynamic_info[DT_JMPREL], tpnt->dynamic_info[DT_PLTRELSZ], 0);
-	}
-	return goof;
-}
-
-void *_dl_malloc(int size)
-{
-	void *retval;
-
-#ifdef DL_DEBUG
-	SEND_STDERR("malloc: request for ");
-	SEND_NUMBER_STDERR(size, 0);
-	SEND_STDERR(" bytes\n");
-#endif	
-
-	if (_dl_malloc_function)
-		return (*_dl_malloc_function) (size);
-
-	if (_dl_malloc_addr - _dl_mmap_zero + size > 4096) {
-#ifdef DL_DEBUG
-		SEND_STDERR("malloc: mmapping more memory\n");
-#endif	
-		_dl_mmap_zero = _dl_malloc_addr = _dl_mmap((void *) 0, size, 
-			PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-		if (_dl_mmap_check_error(_dl_mmap_zero)) {
-			_dl_fprintf(2, "%s: mmap of a spare page failed!\n", _dl_progname);
-			_dl_exit(20);
-		}
-	}
-	retval = _dl_malloc_addr;
-	_dl_malloc_addr += size;
-
-	/*
-	 * Align memory to 4 byte boundary.  Some platforms require this, others
-	 * simply get better performance.
-	 */
-	_dl_malloc_addr = (char *) (((unsigned long) _dl_malloc_addr + 3) & ~(3));
-	return retval;
-}
-
-char *_dl_getenv(char *symbol, char **envp)
-{
-	char *pnt;
-	char *pnt1;
-
-	while ((pnt = *envp++)) {
-		pnt1 = symbol;
-		while (*pnt && *pnt == *pnt1)
-			pnt1++, pnt++;
-		if (!*pnt || *pnt != '=' || *pnt1)
-			continue;
-		return pnt + 1;
-	}
-	return 0;
-}
-
-void _dl_unsetenv(char *symbol, char **envp)
-{
-	char *pnt;
-	char *pnt1;
-	char **newenvp = envp;
-
-	for (pnt = *envp; pnt; pnt = *++envp) {
-		pnt1 = symbol;
-		while (*pnt && *pnt == *pnt1)
-			pnt1++, pnt++;
-		if (!*pnt || *pnt != '=' || *pnt1)
-			*newenvp++ = *envp;
-	}
-	*newenvp++ = *envp;
-	return;
-}
-
-char *_dl_strdup(const char *string)
-{
-	char *retval;
-	int len;
-
-	len = _dl_strlen(string);
-	retval = _dl_malloc(len + 1);
-	_dl_strcpy(retval, string);
-	return retval;
-}
-
-char *_dl_get_last_path_component(char *path)
-{
-	char *s;
-
-	s=path+_dl_strlen(path)-1;
-
-	/* strip trailing slashes */
-	while (s != path && *s == '/') {
-		*s-- = '\0';
-	}
-
-	/* find last component */
-	s = _dl_strrchr(path, '/');
-	if (s == NULL || s[1] == '\0')
-		return path;
-	else
-		return s+1;
-}
-
-size_t _dl_strlen(const char * str)
-{
-	register char *ptr = (char *) str;
-
-	while (*ptr)
-		ptr++;
-	return (ptr - str);
-}
-
-char * _dl_strcpy(char * dst,const char *src)
-{
-	register char *ptr = dst;
-
-	while (*src)
-		*dst++ = *src++;
-	*dst = '\0';
-
-	return ptr;
-}
- 
-int _dl_strcmp(const char * s1,const char * s2)
-{
-	unsigned register char c1, c2;
-
-	do {
-		c1 = (unsigned char) *s1++;
-		c2 = (unsigned char) *s2++;
-		if (c1 == '\0')
-			return c1 - c2;
-	}
-	while (c1 == c2);
-
-	return c1 - c2;
-}
-
-int _dl_strncmp(const char * s1,const char * s2,size_t len)
-{
-	unsigned register char c1 = '\0';
-	unsigned register char c2 = '\0';
-
-	while (len > 0) {
-		c1 = (unsigned char) *s1++;
-		c2 = (unsigned char) *s2++;
-		if (c1 == '\0' || c1 != c2)
-			return c1 - c2;
-		len--;
-	}
-
-	return c1 - c2;
-}
-
-char * _dl_strchr(const char * str,int c)
-{
-	register char ch;
-
-	do {
-		if ((ch = *str) == c)
-			return (char *) str;
-		str++;
-	}
-	while (ch);
-
-	return 0;
-}
-
-char *_dl_strrchr(const char *str, int c)
-{
-    register char *prev = 0;
-    register char *ptr = (char *) str;
-
-    while (*ptr != '\0') {
-	if (*ptr == c)
-	    prev = ptr;
-	ptr++;  
-    }   
-    if (c == '\0')
-	return(ptr);
-    return(prev);
-}
-
-void * _dl_memcpy(void * dst, const void * src, size_t len)
-{
-	register char *a = dst;
-	register const char *b = src;
-
-	while (len--)
-		*a++ = *b++;
-
-	return dst;
-}
-
-void * _dl_memset(void * str,int c,size_t len)
-{
-	register char *a = str;
-
-	while (len--)
-		*a++ = c;
-
-	return str;
-}
-
-/* Minimum printf which handles only characters, %d's and %s's */
-void _dl_fprintf(int fd, const char *fmt, ...)
-{
-    int num;
-    va_list args;
-    char *start, *ptr, *string;
-    char buf[2048];
-
-    start = ptr = buf;
-    
-    if (!fmt)
-	return;
-
-    if (_dl_strlen(fmt) >= (sizeof(buf)-1))
-	_dl_write(fd, "(overflow)\n", 10);
-
-    _dl_strcpy(buf, fmt);
-    va_start(args, fmt);
-
-    while(start)
-    {
-	while(*ptr != '%' && *ptr) { 
-	    ptr++;
-	}
-
-	if(*ptr == '%')
-	{
-	    *ptr++ = '\0';
-	    _dl_write(fd, start, _dl_strlen(start));
-
-	    switch(*ptr++)
-	    {
-		case 's':
-		    string = va_arg(args, char *);
-		    if (!string)
-			_dl_write(fd, "(null)", 6);
-		    else
-			_dl_write(fd, string, _dl_strlen(string));
-		    break;
-
-		case 'i':
-		case 'd':
-		    {
-			char tmp[13];
-			num = va_arg(args, int);
-			string = _dl_simple_ltoa_inline(tmp, num);
-			_dl_write(fd, string, _dl_strlen(string));
-			break;
-		    }
-		case 'x':
-		case 'X':
-		    {
-			char tmp[13];
-			num = va_arg(args, int);
-			string = _dl_simple_ltoahex_inline(tmp, num);
-			_dl_write(fd, string, _dl_strlen(string));
-			break;
-		    }
-		default:
-			_dl_write(fd, "(null)", 6);
-			break;
-	    }
-
-	    start = ptr;
-	}
-	else
-	{
-	    _dl_write(fd, start, _dl_strlen(start));
-	    start = NULL;
-	}
-    }
-    return;
-}
-
diff --git a/ldso/ldso/ld_string.h b/ldso/ldso/ld_string.h
index caa47aa60..fcdb8768b 100644
--- a/ldso/ldso/ld_string.h
+++ b/ldso/ldso/ld_string.h
@@ -7,23 +7,27 @@ extern void *_dl_malloc(int size);
 extern char *_dl_getenv(char *symbol, char **envp);
 extern void _dl_unsetenv(char *symbol, char **envp);
 extern char *_dl_strdup(const char *string);
-extern char *_dl_get_last_path_component(char *path);
-extern size_t _dl_strlen(const char * str);
-extern char * _dl_strcpy(char * dst,const char *src);
-extern int _dl_strcmp(const char * s1,const char * s2);
-extern int _dl_strncmp(const char * s1,const char * s2,size_t len);
-extern char * _dl_strchr(const char * str,int c);
-extern char *_dl_strrchr(const char *str, int c);
-extern void * _dl_memcpy(void * dst, const void * src, size_t len);
-extern int _dl_memcmp(const void * s1,const void * s2,size_t len);
-extern void * _dl_memset(void * str,int c,size_t len);
-extern void _dl_fprintf(int, const char *, ...);
+extern void _dl_dprintf(int, const char *, ...);
+
+
+static size_t _dl_strlen(const char * str);
+static char * _dl_strcpy(char * dst,const char *src);
+static int _dl_strcmp(const char * s1,const char * s2);
+static int _dl_strncmp(const char * s1,const char * s2,size_t len);
+static char * _dl_strchr(const char * str,int c);
+static char *_dl_strrchr(const char *str, int c);
+static void * _dl_memcpy(void * dst, const void * src, size_t len);
+static int _dl_memcmp(const void * s1,const void * s2,size_t len);
+static void * _dl_memset(void * str,int c,size_t len);
+static char *_dl_get_last_path_component(char *path);
+static char *_dl_simple_ltoa(char * local, unsigned long i);
+static char *_dl_simple_ltoahex(char * local, unsigned long i);
 
 #ifndef NULL
 #define NULL ((void *) 0)
 #endif
 
-static inline size_t _dl_strlen_inline(const char * str)
+static inline size_t _dl_strlen(const char * str)
 {
 	register char *ptr = (char *) str;
 
@@ -32,7 +36,7 @@ static inline size_t _dl_strlen_inline(const char * str)
 	return (ptr - str);
 }
 
-static inline char * _dl_strcpy_inline(char * dst,const char *src)
+static inline char * _dl_strcpy(char * dst,const char *src)
 {
 	register char *ptr = dst;
 
@@ -43,7 +47,7 @@ static inline char * _dl_strcpy_inline(char * dst,const char *src)
 	return ptr;
 }
  
-static inline int _dl_strcmp_inline(const char * s1,const char * s2)
+static inline int _dl_strcmp(const char * s1,const char * s2)
 {
 	unsigned register char c1, c2;
 
@@ -58,7 +62,7 @@ static inline int _dl_strcmp_inline(const char * s1,const char * s2)
 	return c1 - c2;
 }
 
-static inline int _dl_strncmp_inline(const char * s1,const char * s2,size_t len)
+static inline int _dl_strncmp(const char * s1,const char * s2,size_t len)
 {
 	unsigned register char c1 = '\0';
 	unsigned register char c2 = '\0';
@@ -74,7 +78,7 @@ static inline int _dl_strncmp_inline(const char * s1,const char * s2,size_t len)
 	return c1 - c2;
 }
 
-static inline char * _dl_strchr_inline(const char * str,int c)
+static inline char * _dl_strchr(const char * str,int c)
 {
 	register char ch;
 
@@ -88,7 +92,7 @@ static inline char * _dl_strchr_inline(const char * str,int c)
 	return 0;
 }
 
-static inline char *_dl_strrchr_inline(const char *str, int c)
+static inline char *_dl_strrchr(const char *str, int c)
 {
     register char *prev = 0;
     register char *ptr = (char *) str;
@@ -103,7 +107,7 @@ static inline char *_dl_strrchr_inline(const char *str, int c)
     return(prev);
 }
 
-static inline void * _dl_memcpy_inline(void * dst, const void * src, size_t len)
+static inline void * _dl_memcpy(void * dst, const void * src, size_t len)
 {
 	register char *a = dst;
 	register const char *b = src;
@@ -115,7 +119,7 @@ static inline void * _dl_memcpy_inline(void * dst, const void * src, size_t len)
 }
 
 
-static inline int _dl_memcmp_inline(const void * s1,const void * s2,size_t len)
+static inline int _dl_memcmp(const void * s1,const void * s2,size_t len)
 {
 	unsigned char *c1 = (unsigned char *)s1;
 	unsigned char *c2 = (unsigned char *)s2;
@@ -129,7 +133,7 @@ static inline int _dl_memcmp_inline(const void * s1,const void * s2,size_t len)
 	return 0;
 }
 
-static inline void * _dl_memset_inline(void * str,int c,size_t len)
+static inline void * _dl_memset(void * str,int c,size_t len)
 {
 	register char *a = str;
 
@@ -139,7 +143,7 @@ static inline void * _dl_memset_inline(void * str,int c,size_t len)
 	return str;
 }
 
-static inline char *_dl_get_last_path_component_inline(char *path)
+static inline char *_dl_get_last_path_component(char *path)
 {
 	char *s;
 	register char *ptr = path;
@@ -171,7 +175,7 @@ static inline char *_dl_get_last_path_component_inline(char *path)
 
 /* Early on, we can't call printf, so use this to print out
  * numbers using the SEND_STDERR() macro */
-static inline char *_dl_simple_ltoa_inline(char * local, unsigned long i)
+static inline char *_dl_simple_ltoa(char * local, unsigned long i)
 {
 	/* 21 digits plus null terminator, good for 64-bit or smaller ints */
 	char *p = &local[21];
@@ -183,7 +187,7 @@ static inline char *_dl_simple_ltoa_inline(char * local, unsigned long i)
 	return p + 1;
 }
 
-static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i)
+static inline char *_dl_simple_ltoahex(char * local, unsigned long i)
 {
 	/* 21 digits plus null terminator, good for 64-bit or smaller ints */
 	char *p = &local[21];
@@ -208,17 +212,17 @@ static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i)
 #define SEND_STDERR(X)				\
   { const char *__s = (X);			\
     if (__s < (const char *) load_addr) __s += load_addr;	\
-    _dl_write (2, __s, _dl_strlen_inline (__s));	\
+    _dl_write (2, __s, _dl_strlen (__s));	\
   }
 #else
-#define SEND_STDERR(X) _dl_write(2, X, _dl_strlen_inline(X));
+#define SEND_STDERR(X) _dl_write(2, X, _dl_strlen(X));
 #endif
 
 #define SEND_ADDRESS_STDERR(X, add_a_newline) { \
     char tmp[13], *tmp1; \
-    _dl_memset_inline(tmp, 0, sizeof(tmp)); \
-    tmp1=_dl_simple_ltoahex_inline( tmp, (unsigned long)(X)); \
-    _dl_write(2, tmp1, _dl_strlen_inline(tmp1)); \
+    _dl_memset(tmp, 0, sizeof(tmp)); \
+    tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \
+    _dl_write(2, tmp1, _dl_strlen(tmp1)); \
     if (add_a_newline) { \
 	tmp[0]='\n'; \
 	_dl_write(2, tmp, 1); \
@@ -227,9 +231,9 @@ static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i)
 
 #define SEND_NUMBER_STDERR(X, add_a_newline) { \
     char tmp[13], *tmp1; \
-    _dl_memset_inline(tmp, 0, sizeof(tmp)); \
-    tmp1=_dl_simple_ltoahex_inline( tmp, (unsigned long)(X)); \
-    _dl_write(2, tmp1, _dl_strlen_inline(tmp1)); \
+    _dl_memset(tmp, 0, sizeof(tmp)); \
+    tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \
+    _dl_write(2, tmp1, _dl_strlen(tmp1)); \
     if (add_a_newline) { \
 	tmp[0]='\n'; \
 	_dl_write(2, tmp, 1); \
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 038a68dbb..43c89adbc 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -207,7 +207,7 @@ DL_BOOT(unsigned long args)
 		Elf32_auxv_t *auxv_entry = (Elf32_auxv_t*) aux_dat;
 
 		if (auxv_entry->a_type <= AT_EGID) {
-			_dl_memcpy_inline(&(auxv_t[auxv_entry->a_type]), 
+			_dl_memcpy(&(auxv_t[auxv_entry->a_type]), 
 				auxv_entry, sizeof(Elf32_auxv_t));
 		}
 		aux_dat += 2;
@@ -221,7 +221,7 @@ DL_BOOT(unsigned long args)
 	/* Check the ELF header to make sure everything looks ok.  */
 	if (! header || header->e_ident[EI_CLASS] != ELFCLASS32 ||
 		header->e_ident[EI_VERSION] != EV_CURRENT || 
-		_dl_strncmp_inline((void *)header, ELFMAGIC, SELFMAG) != 0)
+		_dl_strncmp((void *)header, ELFMAGIC, SELFMAG) != 0)
 	{
 	    SEND_STDERR("Invalid ELF header\n");
 	    _dl_exit(0);
@@ -314,15 +314,15 @@ found_got:
 	}
 
 	tpnt = DL_MALLOC(sizeof(struct elf_resolve));
-	_dl_memset_inline(tpnt, 0, sizeof(*tpnt));
+	_dl_memset(tpnt, 0, sizeof(*tpnt));
 	app_tpnt = DL_MALLOC(sizeof(struct elf_resolve));
-	_dl_memset_inline(app_tpnt, 0, sizeof(*app_tpnt));
+	_dl_memset(app_tpnt, 0, sizeof(*app_tpnt));
 
 	/*
 	 * This is used by gdb to locate the chain of shared libraries that are currently loaded.
 	 */
 	debug_addr = DL_MALLOC(sizeof(struct r_debug));
-	_dl_memset_inline(debug_addr, 0, sizeof(*debug_addr));
+	_dl_memset(debug_addr, 0, sizeof(*debug_addr));
 
 	/* OK, that was easy.  Next scan the DYNAMIC section of the image.
 	   We are only doing ourself right now - we will have to do the rest later */
@@ -630,10 +630,10 @@ found_got:
 					if (!tpnt1) {
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects)
-							_dl_fprintf(1, "\t%s => not found\n", str);
+							_dl_dprintf(1, "\t%s => not found\n", str);
 						else {
 #endif
-							_dl_fprintf(2, "%s: can't load "
+							_dl_dprintf(2, "%s: can't load "
 								"library '%s'\n", _dl_progname, str);
 							_dl_exit(15);
 #ifdef DL_TRACE
@@ -646,7 +646,7 @@ found_got:
 							/* this is a real hack to make ldd not print 
 							 * the library itself when run on a library. */
 							if (_dl_strcmp(_dl_progname, str) != 0)
-								_dl_fprintf(1, "\t%s => %s (0x%x)\n", str, tpnt1->libname, 
+								_dl_dprintf(1, "\t%s => %s (0x%x)\n", str, tpnt1->libname, 
 									(unsigned) tpnt1->loadaddr);
 						}
 #endif
@@ -674,14 +674,14 @@ found_got:
 
 			if (!_dl_stat(LDSO_PRELOAD, &st) && st.st_size > 0) {
 				if ((fd = _dl_open(LDSO_PRELOAD, O_RDONLY)) < 0) {
-					_dl_fprintf(2, "%s: can't open file '%s'\n", 
+					_dl_dprintf(2, "%s: can't open file '%s'\n", 
 						_dl_progname, LDSO_PRELOAD);
 				} else {
 					preload = (caddr_t) _dl_mmap(0, st.st_size + 1, 
 						PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
 					_dl_close(fd);
 					if (preload == (caddr_t) - 1) {
-						_dl_fprintf(2, "%s: can't map file '%s'\n", 
+						_dl_dprintf(2, "%s: can't map file '%s'\n", 
 							_dl_progname, LDSO_PRELOAD);
 					} else {
 						char c, *cp, *cp2;
@@ -714,10 +714,10 @@ found_got:
 							if (!tpnt1) {
 #ifdef DL_TRACE
 								if (_dl_trace_loaded_objects)
-									_dl_fprintf(1, "\t%s => not found\n", cp2);
+									_dl_dprintf(1, "\t%s => not found\n", cp2);
 								else {
 #endif
-									_dl_fprintf(2, "%s: can't load library '%s'\n", 
+									_dl_dprintf(2, "%s: can't load library '%s'\n", 
 										_dl_progname, cp2);
 									_dl_exit(15);
 #ifdef DL_TRACE
@@ -727,7 +727,7 @@ found_got:
 #ifdef DL_TRACE
 								if (_dl_trace_loaded_objects
 									&& !tpnt1->usage_count) {
-									_dl_fprintf(1, "\t%s => %s (0x%x)\n", cp2, 
+									_dl_dprintf(1, "\t%s => %s (0x%x)\n", cp2, 
 										tpnt1->libname, (unsigned) tpnt1->loadaddr);
 								}
 #endif
@@ -766,7 +766,7 @@ found_got:
 
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects && !tpnt->usage_count) {
-						    _dl_fprintf(1, "\t%s => %s (0x%x)\n", 
+						    _dl_dprintf(1, "\t%s => %s (0x%x)\n", 
 							    lpnt, tpnt->libname, (unsigned) tpnt->loadaddr);
 						}
 #endif
@@ -789,10 +789,10 @@ found_got:
 					if (!(tpnt1 = _dl_load_shared_library(0, tcurr, lpnt))) {
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects)
-							_dl_fprintf(1, "\t%s => not found\n", lpnt);
+							_dl_dprintf(1, "\t%s => not found\n", lpnt);
 						else {
 #endif
-							_dl_fprintf(2, "%s: can't load library '%s'\n", 
+							_dl_dprintf(2, "%s: can't load library '%s'\n", 
 								_dl_progname, lpnt);
 							_dl_exit(16);
 #ifdef DL_TRACE
@@ -801,7 +801,7 @@ found_got:
 					} else {
 #ifdef DL_TRACE
 						if (_dl_trace_loaded_objects && !tpnt1->usage_count)
-							_dl_fprintf(1, "\t%s => %s (0x%x)\n", lpnt, tpnt1->libname, 
+							_dl_dprintf(1, "\t%s => %s (0x%x)\n", lpnt, tpnt1->libname, 
 								(unsigned) tpnt1->loadaddr);
 #endif
 						rpnt->next = (struct dyn_elf *)
@@ -955,13 +955,13 @@ found_got:
 #undef DL_DEBUG
 #ifdef DL_DEBUG
 		else {
-			_dl_fprintf(2, tpnt->libname);
-			_dl_fprintf(2, ": ");
+			_dl_dprintf(2, tpnt->libname);
+			_dl_dprintf(2, ": ");
 			if (!_dl_atexit)
-				_dl_fprintf(2, "The address is atexit () is 0x0.");
+				_dl_dprintf(2, "The address is atexit () is 0x0.");
 			if (!tpnt->dynamic_info[DT_FINI])
-				_dl_fprintf(2, "Invalid .fini section.");
-			_dl_fprintf(2, "\n");
+				_dl_dprintf(2, "Invalid .fini section.");
+			_dl_dprintf(2, "\n");
 		}
 #endif
 #undef DL_DEBUG
@@ -996,7 +996,7 @@ int _dl_fixup(struct elf_resolve *tpnt)
 		goof += _dl_fixup(tpnt->next);
 	if (tpnt->dynamic_info[DT_REL]) {
 #ifdef ELF_USES_RELOCA
-		_dl_fprintf(2, "%s: can't handle REL relocation records\n", 
+		_dl_dprintf(2, "%s: can't handle REL relocation records\n", 
 			_dl_progname);
 		_dl_exit(17);
 #else
@@ -1015,7 +1015,7 @@ int _dl_fixup(struct elf_resolve *tpnt)
 		goof += _dl_parse_relocation_information(tpnt, 
 			tpnt->dynamic_info[DT_RELA], tpnt->dynamic_info[DT_RELASZ], 0);
 #else
-		_dl_fprintf(2, "%s: can't handle RELA relocation records\n", 
+		_dl_dprintf(2, "%s: can't handle RELA relocation records\n", 
 			_dl_progname);
 		_dl_exit(18);
 #endif
@@ -1054,7 +1054,7 @@ void *_dl_malloc(int size)
 		_dl_mmap_zero = _dl_malloc_addr = _dl_mmap((void *) 0, size, 
 			PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 		if (_dl_mmap_check_error(_dl_mmap_zero)) {
-			_dl_fprintf(2, "%s: mmap of a spare page failed!\n", _dl_progname);
+			_dl_dprintf(2, "%s: mmap of a spare page failed!\n", _dl_progname);
 			_dl_exit(20);
 		}
 	}
@@ -1113,144 +1113,8 @@ char *_dl_strdup(const char *string)
 	return retval;
 }
 
-char *_dl_get_last_path_component(char *path)
-{
-	char *s;
-
-	s=path+_dl_strlen(path)-1;
-
-	/* strip trailing slashes */
-	while (s != path && *s == '/') {
-		*s-- = '\0';
-	}
-
-	/* find last component */
-	s = _dl_strrchr(path, '/');
-	if (s == NULL || s[1] == '\0')
-		return path;
-	else
-		return s+1;
-}
-
-size_t _dl_strlen(const char * str)
-{
-	register char *ptr = (char *) str;
-
-	while (*ptr)
-		ptr++;
-	return (ptr - str);
-}
-
-char * _dl_strcpy(char * dst,const char *src)
-{
-	register char *ptr = dst;
-
-	while (*src)
-		*dst++ = *src++;
-	*dst = '\0';
-
-	return ptr;
-}
- 
-int _dl_strcmp(const char * s1,const char * s2)
-{
-	unsigned register char c1, c2;
-
-	do {
-		c1 = (unsigned char) *s1++;
-		c2 = (unsigned char) *s2++;
-		if (c1 == '\0')
-			return c1 - c2;
-	}
-	while (c1 == c2);
-
-	return c1 - c2;
-}
-
-int _dl_strncmp(const char * s1,const char * s2,size_t len)
-{
-	unsigned register char c1 = '\0';
-	unsigned register char c2 = '\0';
-
-	while (len > 0) {
-		c1 = (unsigned char) *s1++;
-		c2 = (unsigned char) *s2++;
-		if (c1 == '\0' || c1 != c2)
-			return c1 - c2;
-		len--;
-	}
-
-	return c1 - c2;
-}
-
-char * _dl_strchr(const char * str,int c)
-{
-	register char ch;
-
-	do {
-		if ((ch = *str) == c)
-			return (char *) str;
-		str++;
-	}
-	while (ch);
-
-	return 0;
-}
-
-char *_dl_strrchr(const char *str, int c)
-{
-    register char *prev = 0;
-    register char *ptr = (char *) str;
-
-    while (*ptr != '\0') {
-	if (*ptr == c)
-	    prev = ptr;
-	ptr++;  
-    }   
-    if (c == '\0')
-	return(ptr);
-    return(prev);
-}
-
-void * _dl_memcpy(void * dst, const void * src, size_t len)
-{
-	register char *a = dst;
-	register const char *b = src;
-
-	while (len--)
-		*a++ = *b++;
-
-	return dst;
-}
-
-#ifdef USE_CACHE
-int _dl_memcmp(const void * s1,const void * s2,size_t len)
-{
-	unsigned char *c1 = (unsigned char *)s1;
-	unsigned char *c2 = (unsigned char *)s2;
-
-	while (len--) {
-		if (*c1 != *c2) 
-			return *c1 - *c2;
-		c1++;
-		c2++;
-	}
-	return 0;
-}
-#endif
-
-void * _dl_memset(void * str,int c,size_t len)
-{
-	register char *a = str;
-
-	while (len--)
-		*a++ = c;
-
-	return str;
-}
-
 /* Minimum printf which handles only characters, %d's and %s's */
-void _dl_fprintf(int fd, const char *fmt, ...)
+void _dl_dprintf(int fd, const char *fmt, ...)
 {
     int num;
     va_list args;
@@ -1294,7 +1158,7 @@ void _dl_fprintf(int fd, const char *fmt, ...)
 		    {
 			char tmp[13];
 			num = va_arg(args, int);
-			string = _dl_simple_ltoa_inline(tmp, num);
+			string = _dl_simple_ltoa(tmp, num);
 			_dl_write(fd, string, _dl_strlen(string));
 			break;
 		    }
@@ -1303,7 +1167,7 @@ void _dl_fprintf(int fd, const char *fmt, ...)
 		    {
 			char tmp[13];
 			num = va_arg(args, int);
-			string = _dl_simple_ltoahex_inline(tmp, num);
+			string = _dl_simple_ltoahex(tmp, num);
 			_dl_write(fd, string, _dl_strlen(string));
 			break;
 		    }
diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c
index 07a4599e9..cdd2d337d 100644
--- a/ldso/ldso/m68k/elfinterp.c
+++ b/ldso/ldso/m68k/elfinterp.c
@@ -83,7 +83,7 @@ _dl_linux_resolver (int dummy1, int dummy2,
 
   if (reloc_type != R_68K_JMP_SLOT)
     {
-      _dl_fprintf (2, "%s: incorrect relocation type in jump relocations\n",
+      _dl_dprintf (2, "%s: incorrect relocation type in jump relocations\n",
 		    _dl_progname);
       _dl_exit (1);
     }
@@ -93,7 +93,7 @@ _dl_linux_resolver (int dummy1, int dummy2,
   got_addr = (char **) instr_addr;
 
 #ifdef DEBUG
-  _dl_fprintf (2, "Resolving symbol %s\n",
+  _dl_dprintf (2, "Resolving symbol %s\n",
 		strtab + symtab[symtab_index].st_name);
 #endif
 
@@ -102,14 +102,14 @@ _dl_linux_resolver (int dummy1, int dummy2,
 			    tpnt->symbol_scope, (int) got_addr, tpnt, 0);
   if (!new_addr)
     {
-      _dl_fprintf (2, "%s: can't resolve symbol '%s'\n",
+      _dl_dprintf (2, "%s: can't resolve symbol '%s'\n",
 		    _dl_progname, strtab + symtab[symtab_index].st_name);
       _dl_exit (1);
     }
 /* #define DEBUG_LIBRARY */
 #ifdef DEBUG_LIBRARY
   if ((unsigned int) got_addr < 0x40000000)
-    _dl_fprintf (2, "Calling library function: %s\n",
+    _dl_dprintf (2, "Calling library function: %s\n",
 		  strtab + symtab[symtab_index].st_name);
   else
 #endif
@@ -158,13 +158,13 @@ _dl_parse_lazy_relocation_information (struct elf_resolve *tpnt,
 	  *reloc_addr += (unsigned int) tpnt->loadaddr;
 	  break;
 	default:
-	  _dl_fprintf (2, "%s: (LAZY) can't handle reloc type ", _dl_progname);
+	  _dl_dprintf (2, "%s: (LAZY) can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-	  _dl_fprintf (2, "%s ", _dl_reltypes[reloc_type]);
+	  _dl_dprintf (2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 	  if (symtab_index)
-	    _dl_fprintf (2, "'%s'", strtab + symtab[symtab_index].st_name);
-	  _dl_fprintf (2, "\n");
+	    _dl_dprintf (2, "'%s'", strtab + symtab[symtab_index].st_name);
+	  _dl_dprintf (2, "\n");
 	  _dl_exit (1);
 	}
     }
@@ -218,7 +218,7 @@ _dl_parse_relocation_information (struct elf_resolve *tpnt,
 	  if (!symbol_addr
 	      && ELF32_ST_BIND (symtab[symtab_index].st_info) == STB_GLOBAL)
 	    {
-	      _dl_fprintf (2, "%s: can't resolve symbol '%s'\n",
+	      _dl_dprintf (2, "%s: can't resolve symbol '%s'\n",
 			    _dl_progname, strtab + symtab[symtab_index].st_name);
 	      goof++;
 	    }
@@ -259,24 +259,24 @@ _dl_parse_relocation_information (struct elf_resolve *tpnt,
 	  break;
 	case R_68K_COPY:
 #if 0 /* Do this later.  */
-	  _dl_fprintf (2, "Doing copy");
+	  _dl_dprintf (2, "Doing copy");
 	  if (symtab_index)
-	    _dl_fprintf (2, " for symbol %s",
+	    _dl_dprintf (2, " for symbol %s",
 			  strtab + symtab[symtab_index].st_name);
-	  _dl_fprintf (2, "\n");
+	  _dl_dprintf (2, "\n");
 	  _dl_memcpy ((void *) symtab[symtab_index].st_value,
 		      (void *) symbol_addr,
 		      symtab[symtab_index].st_size);
 #endif
 	  break;
 	default:
-	  _dl_fprintf (2, "%s: can't handle reloc type ", _dl_progname);
+	  _dl_dprintf (2, "%s: can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-	  _dl_fprintf (2, "%s ", _dl_reltypes[reloc_type]);
+	  _dl_dprintf (2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 	  if (symtab_index)
-	    _dl_fprintf (2, "'%s'", strtab + symtab[symtab_index].st_name);
-	  _dl_fprintf (2, "\n");
+	    _dl_dprintf (2, "'%s'", strtab + symtab[symtab_index].st_name);
+	  _dl_dprintf (2, "\n");
 	  _dl_exit (1);
 	}
 
@@ -337,7 +337,7 @@ _dl_parse_copy_information (struct dyn_elf *xpnt, unsigned long rel_addr,
 			   xpnt->next, (int) reloc_addr, NULL, 1);
 	  if (!symbol_addr)
 	    {
-	      _dl_fprintf (2, "%s: can't resolve symbol '%s'\n",
+	      _dl_dprintf (2, "%s: can't resolve symbol '%s'\n",
 			    _dl_progname, strtab + symtab[symtab_index].st_name);
 	      goof++;
 	    }
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index 31b97044a..55de296e6 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -71,16 +71,16 @@ void _dl_init_got(unsigned long *plt,struct elf_resolve *tpnt)
 	unsigned int rel_offset_words;
 	unsigned int offset;
 
-	_dl_fprintf(2,"init_got plt=%x, tpnt=%x\n",
+	_dl_dprintf(2,"init_got plt=%x, tpnt=%x\n",
 		(unsigned long)plt,(unsigned long)tpnt);
 
 	n_plt_entries = tpnt->dynamic_info[DT_PLTRELSZ] / sizeof(ELF_RELOC);
-_dl_fprintf(2,"n_plt_entries %d\n",n_plt_entries);
+_dl_dprintf(2,"n_plt_entries %d\n",n_plt_entries);
 
 rel_offset_words = PLT_DATA_START_WORDS(n_plt_entries);
-_dl_fprintf(2,"rel_offset_words %x\n",rel_offset_words);
+_dl_dprintf(2,"rel_offset_words %x\n",rel_offset_words);
 data_words = (unsigned long)(plt + rel_offset_words);
-_dl_fprintf(2,"data_words %x\n",data_words);
+_dl_dprintf(2,"data_words %x\n",data_words);
 
 	//lpnt += PLT_INITIAL_ENTRY_WORDS;
 	
@@ -124,7 +124,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	char **got_addr;
 	unsigned long instr_addr;
 
-_dl_fprintf(2,"linux_resolver tpnt=%x reloc_entry=%x\n",tpnt,reloc_entry);
+_dl_dprintf(2,"linux_resolver tpnt=%x reloc_entry=%x\n",tpnt,reloc_entry);
 	rel_addr = (ELF_RELOC *) (tpnt->dynamic_info[DT_JMPREL] + tpnt->loadaddr);
 
 	this_reloc = (void *)rel_addr + reloc_entry;
@@ -136,7 +136,7 @@ _dl_fprintf(2,"linux_resolver tpnt=%x reloc_entry=%x\n",tpnt,reloc_entry);
 
 
 	if (reloc_type != R_PPC_JMP_SLOT) {
-		_dl_fprintf(2, "%s: Incorrect relocation type [%s] in jump relocations\n",
+		_dl_dprintf(2, "%s: Incorrect relocation type [%s] in jump relocations\n",
 			_dl_progname,
 			(reloc_type<N_RELTYPES)?_dl_reltypes[reloc_type]:"unknown");
 		_dl_exit(1);
@@ -148,7 +148,7 @@ _dl_fprintf(2,"linux_resolver tpnt=%x reloc_entry=%x\n",tpnt,reloc_entry);
 	got_addr = (char **) instr_addr;
 
 #ifdef DEBUG
-	_dl_fprintf(2, "Resolving symbol %s %x --> ", 
+	_dl_dprintf(2, "Resolving symbol %s %x --> ", 
 		strtab + symtab[symtab_index].st_name,
 		instr_addr);
 #endif
@@ -157,18 +157,18 @@ _dl_fprintf(2,"linux_resolver tpnt=%x reloc_entry=%x\n",tpnt,reloc_entry);
 	new_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name, 
 		tpnt->symbol_scope, (unsigned long) got_addr, tpnt, 0);
 	if (!new_addr) {
-		_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+		_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 			_dl_progname, strtab + symtab[symtab_index].st_name);
 		_dl_exit(1);
 	};
 #ifdef DEBUG
-	_dl_fprintf(2, "%x\n", new_addr);
+	_dl_dprintf(2, "%x\n", new_addr);
 #endif
 
 /* #define DEBUG_LIBRARY */
 #ifdef DEBUG_LIBRARY
 	if ((unsigned long) got_addr < 0x40000000) {
-		_dl_fprintf(2, "Calling library function: %s\n", 
+		_dl_dprintf(2, "Calling library function: %s\n", 
 			strtab + symtab[symtab_index].st_name);
 	} else {
 		*got_addr = new_addr;
@@ -193,7 +193,7 @@ void _dl_parse_lazy_relocation_information(struct elf_resolve *tpnt,
 	int index;
 
 #ifdef DEBUG
-_dl_fprintf(2,"_dl_parse_lazy_relocation_information(tpnt=%x, rel_addr=%x, rel_size=%x, type=%d)\n",
+_dl_dprintf(2,"_dl_parse_lazy_relocation_information(tpnt=%x, rel_addr=%x, rel_size=%x, type=%d)\n",
 		tpnt,rel_addr,rel_size,type);
 #endif
 	/* Now parse the relocation information */
@@ -219,7 +219,7 @@ _dl_fprintf(2,"_dl_parse_lazy_relocation_information(tpnt=%x, rel_addr=%x, rel_s
 			continue;
 
 #ifdef DEBUG
-_dl_fprintf(2, "L %x %s %s %x %x\n",
+_dl_dprintf(2, "L %x %s %s %x %x\n",
 	reloc_addr, _dl_reltypes[reloc_type],
 	symtab_index?strtab + symtab[symtab_index].st_name:"",0,0);
 #endif
@@ -240,20 +240,20 @@ _dl_fprintf(2, "L %x %s %s %x %x\n",
 				/sizeof(unsigned long);
 			index /= 2;
 #ifdef DEBUG
-_dl_fprintf(2, "        index %x delta %x\n",index,delta);
+_dl_dprintf(2, "        index %x delta %x\n",index,delta);
 #endif
 			reloc_addr[0] = OPCODE_LI(11,index*4);
 			reloc_addr[1] = OPCODE_B(delta);
 			break;
 			}
 		default:
-			_dl_fprintf(2, "%s: (LAZY) can't handle reloc type ", 
+			_dl_dprintf(2, "%s: (LAZY) can't handle reloc type ", 
 				_dl_progname);
 #ifdef VERBOSE_DLINKER
-			_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+			_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 			if (symtab_index)
-				_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 			_dl_exit(1);
 		};
 
@@ -280,7 +280,7 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 	unsigned long *plt;
 
 #ifdef DEBUG
-_dl_fprintf(2,"_dl_parse_relocation_information(tpnt=%x, rel_addr=%x, rel_size=%x, type=%d)\n",
+_dl_dprintf(2,"_dl_parse_relocation_information(tpnt=%x, rel_addr=%x, rel_size=%x, type=%d)\n",
 		tpnt,rel_addr,rel_size,type);
 #endif
 	/* Now parse the relocation information */
@@ -319,13 +319,13 @@ _dl_fprintf(2,"_dl_parse_relocation_information(tpnt=%x, rel_addr=%x, rel_size=%
 			 */
 			if (!symbol_addr &&
 				ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 					_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			}
 		}
 #ifdef DEBUG
-_dl_fprintf(2, "  %x %s %s %x %x\n",
+_dl_dprintf(2, "  %x %s %s %x %x\n",
 	reloc_addr, _dl_reltypes[reloc_type],
 	symtab_index?strtab + symtab[symtab_index].st_name:"",
 	symbol_addr, addend);
@@ -337,7 +337,7 @@ _dl_fprintf(2, "  %x %s %s %x %x\n",
 			{
 			int delta = symbol_addr - (unsigned long)reloc_addr;
 			if(delta<<6>>6 != delta){
-				_dl_fprintf(2,"R_PPC_REL24: Reloc out of range\n");
+				_dl_dprintf(2,"R_PPC_REL24: Reloc out of range\n");
 				_dl_exit(1);
 			}
 			*reloc_addr &= 0xfc000003;
@@ -381,7 +381,7 @@ _dl_fprintf(2, "  %x %s %s %x %x\n",
 		/sizeof(unsigned long);
 	index /= 2;
 #ifdef DEBUG
-_dl_fprintf(2, "        index %x delta %x\n",index,delta);
+_dl_dprintf(2, "        index %x delta %x\n",index,delta);
 #endif
 	reloc_addr[0] = OPCODE_LI(11,index*4);
 	reloc_addr[1] = OPCODE_B(delta);
@@ -390,12 +390,12 @@ _dl_fprintf(2, "        index %x delta %x\n",index,delta);
 			break;
 			}
 		default:
-			_dl_fprintf(2, "%s: can't handle reloc type ", _dl_progname);
+			_dl_dprintf(2, "%s: can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-			_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+			_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 			if (symtab_index)
-				_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 			_dl_exit(1);
 		};
 
@@ -404,7 +404,7 @@ _dl_fprintf(2, "        index %x delta %x\n",index,delta);
 		PPC_SYNC;
 		PPC_ICBI(reloc_addr);
 
-//_dl_fprintf(2,"reloc_addr %x: %x\n",reloc_addr,*reloc_addr);
+//_dl_dprintf(2,"reloc_addr %x: %x\n",reloc_addr,*reloc_addr);
 	};
 	return goof;
 }
@@ -433,7 +433,7 @@ int _dl_parse_copy_information(struct dyn_elf *xpnt, unsigned long rel_addr,
 	struct elf_resolve *tpnt;
 	int symtab_index;
 
-_dl_fprintf(2,"parse_copy xpnt=%x rel_addr=%x rel_size=%x type=%d\n",
+_dl_dprintf(2,"parse_copy xpnt=%x rel_addr=%x rel_size=%x type=%d\n",
 		(int)xpnt,rel_addr,rel_size,type);
 
 	/* Now parse the relocation information */
@@ -465,7 +465,7 @@ _dl_fprintf(2,"parse_copy xpnt=%x rel_addr=%x rel_size=%x type=%d\n",
 				symtab[symtab_index].st_name, xpnt->next, 
 				(unsigned long) reloc_addr, NULL, 1);
 			if (!symbol_addr) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 					_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			};
diff --git a/ldso/ldso/readelflib1.c b/ldso/ldso/readelflib1.c
index ebc9bc8dc..75acde927 100644
--- a/ldso/ldso/readelflib1.c
+++ b/ldso/ldso/readelflib1.c
@@ -54,7 +54,7 @@ int _dl_map_cache(void)
 
 	if (_dl_stat(LDSO_CACHE, &st)
 		|| (fd = _dl_open(LDSO_CACHE, O_RDONLY)) < 0) {
-		_dl_fprintf(2, "%s: can't open cache '%s'\n", _dl_progname, LDSO_CACHE);
+		_dl_dprintf(2, "%s: can't open cache '%s'\n", _dl_progname, LDSO_CACHE);
 		_dl_cache_addr = (caddr_t) - 1;	/* so we won't try again */
 		return -1;
 	}
@@ -63,7 +63,7 @@ int _dl_map_cache(void)
 	_dl_cache_addr = (caddr_t) _dl_mmap(0, _dl_cache_size, PROT_READ, MAP_SHARED, fd, 0);
 	_dl_close(fd);
 	if (_dl_cache_addr == (caddr_t) - 1) {
-		_dl_fprintf(2, "%s: can't map cache '%s'\n", 
+		_dl_dprintf(2, "%s: can't map cache '%s'\n", 
 			_dl_progname, LDSO_CACHE);
 		return -1;
 	}
@@ -77,7 +77,7 @@ int _dl_map_cache(void)
 		(sizeof(header_t) + header->nlibs * sizeof(libentry_t))
 		|| _dl_cache_addr[_dl_cache_size - 1] != '\0') 
 	{
-		_dl_fprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, 
+		_dl_dprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, 
 			LDSO_CACHE);
 		goto fail;
 	}
@@ -90,7 +90,7 @@ int _dl_map_cache(void)
 		if (libent[i].sooffset >= strtabsize || 
 			libent[i].liboffset >= strtabsize) 
 		{
-			_dl_fprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, LDSO_CACHE);
+			_dl_dprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, LDSO_CACHE);
 			goto fail;
 		}
 	}
@@ -387,7 +387,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 		 * NO!  When we open shared libraries we may search several paths.
 		 * it is inappropriate to generate an error here.
 		 */
-		_dl_fprintf(2, "%s: can't open '%s'\n", _dl_progname, libname);
+		_dl_dprintf(2, "%s: can't open '%s'\n", _dl_progname, libname);
 #endif
 		_dl_internal_error_number = DL_ERROR_NOFILE;
 		return NULL;
@@ -400,7 +400,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 		epnt->e_ident[2] != 'L' || 
 		epnt->e_ident[3] != 'F') 
 	{
-		_dl_fprintf(2, "%s: '%s' is not an ELF file\n", _dl_progname,
+		_dl_dprintf(2, "%s: '%s' is not an ELF file\n", _dl_progname,
 					 libname);
 		_dl_internal_error_number = DL_ERROR_NOTELF;
 		_dl_close(infile);
@@ -415,7 +415,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 	{
 		_dl_internal_error_number = 
 		    (epnt->e_type != ET_DYN ? DL_ERROR_NOTDYN : DL_ERROR_NOTMAGIC);
-		_dl_fprintf(2, "%s: '%s' is not an ELF executable for " ELF_TARGET 
+		_dl_dprintf(2, "%s: '%s' is not an ELF executable for " ELF_TARGET 
 			"\n", _dl_progname, libname);
 		_dl_close(infile);
 		return NULL;
@@ -428,7 +428,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 
 		if (ppnt->p_type == PT_DYNAMIC) {
 			if (dynamic_addr)
-				_dl_fprintf(2, "%s: '%s' has more than one dynamic section\n", 
+				_dl_dprintf(2, "%s: '%s' has more than one dynamic section\n", 
 					_dl_progname, libname);
 			dynamic_addr = ppnt->p_vaddr;
 			dynamic_size = ppnt->p_filesz;
@@ -460,7 +460,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 	status = (char *) _dl_mmap((char *) (piclib ? 0 : minvma), 
 		maxvma - minvma, PROT_NONE, flags | MAP_ANONYMOUS, -1, 0);
 	if (_dl_mmap_check_error(status)) {
-		_dl_fprintf(2, "%s: can't map '/dev/zero'\n", _dl_progname);
+		_dl_dprintf(2, "%s: can't map '/dev/zero'\n", _dl_progname);
 		_dl_internal_error_number = DL_ERROR_MMAP_FAILED;
 		_dl_close(infile);
 		return NULL;
@@ -492,7 +492,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 					ppnt->p_offset & 0x7ffff000);
 
 				if (_dl_mmap_check_error(status)) {
-					_dl_fprintf(2, "%s: can't map '%s'\n", 
+					_dl_dprintf(2, "%s: can't map '%s'\n", 
 						_dl_progname, libname);
 					_dl_internal_error_number = DL_ERROR_MMAP_FAILED;
 					_dl_munmap((char *) libaddr, maxvma - minvma);
@@ -524,7 +524,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 					ppnt->p_filesz, LXFLAGS(ppnt->p_flags), flags, 
 					infile, ppnt->p_offset & 0x7ffff000);
 			if (_dl_mmap_check_error(status)) {
-				_dl_fprintf(2, "%s: can't map '%s'\n", _dl_progname, libname);
+				_dl_dprintf(2, "%s: can't map '%s'\n", _dl_progname, libname);
 				_dl_internal_error_number = DL_ERROR_MMAP_FAILED;
 				_dl_munmap((char *) libaddr, maxvma - minvma);
 				_dl_close(infile);
@@ -554,7 +554,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 
 	if (!dynamic_addr) {
 		_dl_internal_error_number = DL_ERROR_NODYNAMIC;
-		_dl_fprintf(2, "%s: '%s' is missing a dynamic section\n", 
+		_dl_dprintf(2, "%s: '%s' is missing a dynamic section\n", 
 			_dl_progname, libname);
 		return NULL;
 	}
diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c
index 1b011abe2..8ca84e564 100644
--- a/ldso/ldso/sparc/elfinterp.c
+++ b/ldso/ldso/sparc/elfinterp.c
@@ -82,14 +82,14 @@ unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt)
   symtab =  (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
   strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
 
-  _dl_fprintf(2, "tpnt = %x\n", tpnt);
-  _dl_fprintf(2, "reloc = %x\n", this_reloc);
-  _dl_fprintf(2, "symtab = %x\n", symtab);
-  _dl_fprintf(2, "strtab = %x\n", strtab);
+  _dl_dprintf(2, "tpnt = %x\n", tpnt);
+  _dl_dprintf(2, "reloc = %x\n", this_reloc);
+  _dl_dprintf(2, "symtab = %x\n", symtab);
+  _dl_dprintf(2, "strtab = %x\n", strtab);
 
 
   if (reloc_type != R_SPARC_JMP_SLOT) {
-    _dl_fprintf(2, "%s: incorrect relocation type in jump relocations (%d)\n",
+    _dl_dprintf(2, "%s: incorrect relocation type in jump relocations (%d)\n",
 		  _dl_progname, reloc_type);
     _dl_exit(30);
   };
@@ -98,10 +98,10 @@ unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt)
   instr_addr  = ((int)this_reloc->r_offset  + (int)tpnt->loadaddr);
   got_addr = (char **) instr_addr;
 
-  _dl_fprintf(2, "symtab_index %d\n", symtab_index);
+  _dl_dprintf(2, "symtab_index %d\n", symtab_index);
 
 #ifdef DEBUG
-  _dl_fprintf(2, "Resolving symbol %s\n",
+  _dl_dprintf(2, "Resolving symbol %s\n",
 	strtab + symtab[symtab_index].st_name);
 #endif
 
@@ -109,14 +109,14 @@ unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt)
   new_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name, 
   			tpnt->symbol_scope, (int) got_addr, tpnt, 0);
   if(!new_addr) {
-    _dl_fprintf(2, "%s: can't resolve symbol '%s'\n",
+    _dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
 	       _dl_progname, strtab + symtab[symtab_index].st_name);
     _dl_exit(31);
   };
 /* #define DEBUG_LIBRARY */
 #ifdef DEBUG_LIBRARY
   if((unsigned int) got_addr < 0x40000000) {
-    _dl_fprintf(2, "Calling library function: %s\n",
+    _dl_dprintf(2, "Calling library function: %s\n",
 	       strtab + symtab[symtab_index].st_name);
   } else {
     got_addr[1] = (char *) (0x03000000 | (((unsigned int) new_addr >> 10) & 0x3fffff));
@@ -126,7 +126,7 @@ unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt)
   got_addr[1] = (char *) (0x03000000 | (((unsigned int) new_addr >> 10) & 0x3fffff));
   got_addr[2] = (char *) (0x81c06000 | ((unsigned int) new_addr & 0x3ff));
 #endif
-  _dl_fprintf(2, "Address = %x\n",new_addr);
+  _dl_dprintf(2, "Address = %x\n",new_addr);
     _dl_exit(32);
 
   return (unsigned int) new_addr;
@@ -166,11 +166,11 @@ void _dl_parse_lazy_relocation_information(struct elf_resolve * tpnt, int rel_ad
     case R_SPARC_JMP_SLOT:
       break;
     default:
-      _dl_fprintf(2, "%s: (LAZY) can't handle reloc type ", _dl_progname);
+      _dl_dprintf(2, "%s: (LAZY) can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-      _dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+      _dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
-      if(symtab_index) _dl_fprintf(2, "'%s'\n",
+      if(symtab_index) _dl_dprintf(2, "'%s'\n",
 				  strtab + symtab[symtab_index].st_name);
       _dl_exit(33);
     };
@@ -216,7 +216,7 @@ int _dl_parse_relocation_information(struct elf_resolve * tpnt, int rel_addr,
 
       if(!symbol_addr &&
 	 ELF32_ST_BIND(symtab [symtab_index].st_info) == STB_GLOBAL) {
-	_dl_fprintf(2, "%s: can't resolve symbol '%s'\n",
+	_dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
 		     _dl_progname, strtab + symtab[symtab_index].st_name);
 	goof++;
       };
@@ -260,21 +260,21 @@ int _dl_parse_relocation_information(struct elf_resolve * tpnt, int rel_addr,
       break;
     case R_SPARC_COPY:
 #if 0 /* This one is done later */
-      _dl_fprintf(2, "Doing copy for symbol ");
-      if(symtab_index) _dl_fprintf(2, strtab + symtab[symtab_index].st_name);
-      _dl_fprintf(2, "\n");
+      _dl_dprintf(2, "Doing copy for symbol ");
+      if(symtab_index) _dl_dprintf(2, strtab + symtab[symtab_index].st_name);
+      _dl_dprintf(2, "\n");
       _dl_memcpy((void *) symtab[symtab_index].st_value,
 		 (void *) symbol_addr, 
 		 symtab[symtab_index].st_size);
 #endif
       break;
     default:
-      _dl_fprintf(2, "%s: can't handle reloc type ", _dl_progname);
+      _dl_dprintf(2, "%s: can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-      _dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+      _dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
       if (symtab_index)
-	_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+	_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
       _dl_exit(34);
     };
 
@@ -331,7 +331,7 @@ int _dl_parse_copy_information(struct dyn_elf * xpnt, int rel_addr,
 	_dl_find_hash(strtab + symtab[symtab_index].st_name,
 			      xpnt->next, (int) reloc_addr, NULL, 1);
       if(!symbol_addr) {
-	_dl_fprintf(2, "%s: can't resolve symbol '%s'\n",
+	_dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
 		   _dl_progname, strtab + symtab[symtab_index].st_name);
 	goof++;
       };
diff --git a/ldso/ldso/string.h b/ldso/ldso/string.h
index caa47aa60..fcdb8768b 100644
--- a/ldso/ldso/string.h
+++ b/ldso/ldso/string.h
@@ -7,23 +7,27 @@ extern void *_dl_malloc(int size);
 extern char *_dl_getenv(char *symbol, char **envp);
 extern void _dl_unsetenv(char *symbol, char **envp);
 extern char *_dl_strdup(const char *string);
-extern char *_dl_get_last_path_component(char *path);
-extern size_t _dl_strlen(const char * str);
-extern char * _dl_strcpy(char * dst,const char *src);
-extern int _dl_strcmp(const char * s1,const char * s2);
-extern int _dl_strncmp(const char * s1,const char * s2,size_t len);
-extern char * _dl_strchr(const char * str,int c);
-extern char *_dl_strrchr(const char *str, int c);
-extern void * _dl_memcpy(void * dst, const void * src, size_t len);
-extern int _dl_memcmp(const void * s1,const void * s2,size_t len);
-extern void * _dl_memset(void * str,int c,size_t len);
-extern void _dl_fprintf(int, const char *, ...);
+extern void _dl_dprintf(int, const char *, ...);
+
+
+static size_t _dl_strlen(const char * str);
+static char * _dl_strcpy(char * dst,const char *src);
+static int _dl_strcmp(const char * s1,const char * s2);
+static int _dl_strncmp(const char * s1,const char * s2,size_t len);
+static char * _dl_strchr(const char * str,int c);
+static char *_dl_strrchr(const char *str, int c);
+static void * _dl_memcpy(void * dst, const void * src, size_t len);
+static int _dl_memcmp(const void * s1,const void * s2,size_t len);
+static void * _dl_memset(void * str,int c,size_t len);
+static char *_dl_get_last_path_component(char *path);
+static char *_dl_simple_ltoa(char * local, unsigned long i);
+static char *_dl_simple_ltoahex(char * local, unsigned long i);
 
 #ifndef NULL
 #define NULL ((void *) 0)
 #endif
 
-static inline size_t _dl_strlen_inline(const char * str)
+static inline size_t _dl_strlen(const char * str)
 {
 	register char *ptr = (char *) str;
 
@@ -32,7 +36,7 @@ static inline size_t _dl_strlen_inline(const char * str)
 	return (ptr - str);
 }
 
-static inline char * _dl_strcpy_inline(char * dst,const char *src)
+static inline char * _dl_strcpy(char * dst,const char *src)
 {
 	register char *ptr = dst;
 
@@ -43,7 +47,7 @@ static inline char * _dl_strcpy_inline(char * dst,const char *src)
 	return ptr;
 }
  
-static inline int _dl_strcmp_inline(const char * s1,const char * s2)
+static inline int _dl_strcmp(const char * s1,const char * s2)
 {
 	unsigned register char c1, c2;
 
@@ -58,7 +62,7 @@ static inline int _dl_strcmp_inline(const char * s1,const char * s2)
 	return c1 - c2;
 }
 
-static inline int _dl_strncmp_inline(const char * s1,const char * s2,size_t len)
+static inline int _dl_strncmp(const char * s1,const char * s2,size_t len)
 {
 	unsigned register char c1 = '\0';
 	unsigned register char c2 = '\0';
@@ -74,7 +78,7 @@ static inline int _dl_strncmp_inline(const char * s1,const char * s2,size_t len)
 	return c1 - c2;
 }
 
-static inline char * _dl_strchr_inline(const char * str,int c)
+static inline char * _dl_strchr(const char * str,int c)
 {
 	register char ch;
 
@@ -88,7 +92,7 @@ static inline char * _dl_strchr_inline(const char * str,int c)
 	return 0;
 }
 
-static inline char *_dl_strrchr_inline(const char *str, int c)
+static inline char *_dl_strrchr(const char *str, int c)
 {
     register char *prev = 0;
     register char *ptr = (char *) str;
@@ -103,7 +107,7 @@ static inline char *_dl_strrchr_inline(const char *str, int c)
     return(prev);
 }
 
-static inline void * _dl_memcpy_inline(void * dst, const void * src, size_t len)
+static inline void * _dl_memcpy(void * dst, const void * src, size_t len)
 {
 	register char *a = dst;
 	register const char *b = src;
@@ -115,7 +119,7 @@ static inline void * _dl_memcpy_inline(void * dst, const void * src, size_t len)
 }
 
 
-static inline int _dl_memcmp_inline(const void * s1,const void * s2,size_t len)
+static inline int _dl_memcmp(const void * s1,const void * s2,size_t len)
 {
 	unsigned char *c1 = (unsigned char *)s1;
 	unsigned char *c2 = (unsigned char *)s2;
@@ -129,7 +133,7 @@ static inline int _dl_memcmp_inline(const void * s1,const void * s2,size_t len)
 	return 0;
 }
 
-static inline void * _dl_memset_inline(void * str,int c,size_t len)
+static inline void * _dl_memset(void * str,int c,size_t len)
 {
 	register char *a = str;
 
@@ -139,7 +143,7 @@ static inline void * _dl_memset_inline(void * str,int c,size_t len)
 	return str;
 }
 
-static inline char *_dl_get_last_path_component_inline(char *path)
+static inline char *_dl_get_last_path_component(char *path)
 {
 	char *s;
 	register char *ptr = path;
@@ -171,7 +175,7 @@ static inline char *_dl_get_last_path_component_inline(char *path)
 
 /* Early on, we can't call printf, so use this to print out
  * numbers using the SEND_STDERR() macro */
-static inline char *_dl_simple_ltoa_inline(char * local, unsigned long i)
+static inline char *_dl_simple_ltoa(char * local, unsigned long i)
 {
 	/* 21 digits plus null terminator, good for 64-bit or smaller ints */
 	char *p = &local[21];
@@ -183,7 +187,7 @@ static inline char *_dl_simple_ltoa_inline(char * local, unsigned long i)
 	return p + 1;
 }
 
-static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i)
+static inline char *_dl_simple_ltoahex(char * local, unsigned long i)
 {
 	/* 21 digits plus null terminator, good for 64-bit or smaller ints */
 	char *p = &local[21];
@@ -208,17 +212,17 @@ static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i)
 #define SEND_STDERR(X)				\
   { const char *__s = (X);			\
     if (__s < (const char *) load_addr) __s += load_addr;	\
-    _dl_write (2, __s, _dl_strlen_inline (__s));	\
+    _dl_write (2, __s, _dl_strlen (__s));	\
   }
 #else
-#define SEND_STDERR(X) _dl_write(2, X, _dl_strlen_inline(X));
+#define SEND_STDERR(X) _dl_write(2, X, _dl_strlen(X));
 #endif
 
 #define SEND_ADDRESS_STDERR(X, add_a_newline) { \
     char tmp[13], *tmp1; \
-    _dl_memset_inline(tmp, 0, sizeof(tmp)); \
-    tmp1=_dl_simple_ltoahex_inline( tmp, (unsigned long)(X)); \
-    _dl_write(2, tmp1, _dl_strlen_inline(tmp1)); \
+    _dl_memset(tmp, 0, sizeof(tmp)); \
+    tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \
+    _dl_write(2, tmp1, _dl_strlen(tmp1)); \
     if (add_a_newline) { \
 	tmp[0]='\n'; \
 	_dl_write(2, tmp, 1); \
@@ -227,9 +231,9 @@ static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i)
 
 #define SEND_NUMBER_STDERR(X, add_a_newline) { \
     char tmp[13], *tmp1; \
-    _dl_memset_inline(tmp, 0, sizeof(tmp)); \
-    tmp1=_dl_simple_ltoahex_inline( tmp, (unsigned long)(X)); \
-    _dl_write(2, tmp1, _dl_strlen_inline(tmp1)); \
+    _dl_memset(tmp, 0, sizeof(tmp)); \
+    tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \
+    _dl_write(2, tmp1, _dl_strlen(tmp1)); \
     if (add_a_newline) { \
 	tmp[0]='\n'; \
 	_dl_write(2, tmp, 1); \
diff --git a/ldso/libdl/dlib.c b/ldso/libdl/dlib.c
index 7664f3fd4..540b6640f 100644
--- a/ldso/libdl/dlib.c
+++ b/ldso/libdl/dlib.c
@@ -475,11 +475,11 @@ possible, but at run time the normal symbols are accessed. */
 
 static void __attribute__ ((unused)) foobar()
 {
-	_dl_fprintf(2, "libdl library not correctly linked\n");
+	_dl_dprintf(2, "libdl library not correctly linked\n");
 	_dl_exit(1);
 }
 
-asm(".weak _dl_fprintf; _dl_fprintf = foobar");
+asm(".weak _dl_dprintf; _dl_dprintf = foobar");
 asm(".weak _dl_find_hash; _dl_find_hash = foobar");
 asm(".weak _dl_load_shared_library; _dl_load_shared_library = foobar");
 asm(".weak _dl_parse_relocation_information; _dl_parse_relocation_information = foobar");
@@ -490,7 +490,7 @@ asm(".weak _dl_unmap_cache; _dl_unmap_cache = foobar");
 #endif	
 
 #if 0
-weak_alias(_dl_fprintf, foobar);
+weak_alias(_dl_dprintf, foobar);
 weak_alias(_dl_find_hash, foobar);
 weak_alias(_dl_load_shared_library, foobar);
 weak_alias(_dl_parse_relocation_information, foobar);
@@ -528,10 +528,10 @@ void _dlinfo()
 	struct elf_resolve *tpnt;
 	struct dyn_elf *rpnt, *hpnt;
 
-	_dl_fprintf(2, "List of loaded modules\n");
+	_dl_dprintf(2, "List of loaded modules\n");
 	/* First start with a complete list of all of the loaded files. */
 	for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next) { 
-		_dl_fprintf(2, "\t%x %x %x %s %d %s\n", 
+		_dl_dprintf(2, "\t%x %x %x %s %d %s\n", 
 			(unsigned) tpnt->loadaddr, (unsigned) tpnt,
 			(unsigned) tpnt->symbol_scope,
 			type[tpnt->libtype],
@@ -539,15 +539,15 @@ void _dlinfo()
 	}
 
 	/* Next dump the module list for the application itself */
-	_dl_fprintf(2, "\nModules for application (%x):\n",
+	_dl_dprintf(2, "\nModules for application (%x):\n",
 				 (unsigned) _dl_symbol_tables);
 	for (rpnt = _dl_symbol_tables; rpnt; rpnt = rpnt->next)
-		_dl_fprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, rpnt->dyn->libname);
+		_dl_dprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, rpnt->dyn->libname);
 
 	for (hpnt = _dl_handles; hpnt; hpnt = hpnt->next_handle) {
-		_dl_fprintf(2, "Modules for handle %x\n", (unsigned) hpnt);
+		_dl_dprintf(2, "Modules for handle %x\n", (unsigned) hpnt);
 		for (rpnt = hpnt; rpnt; rpnt = rpnt->next)
-			_dl_fprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, 
+			_dl_dprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, 
 				rpnt->dyn->libname);
 	}
 }
@@ -567,7 +567,7 @@ int _dladdr(void *__address, Dl_info * __dlip)
 	pelf = NULL;
 
 #if 0
-	_dl_fprintf(2, "dladdr( 0x%p, 0x%p )\n", __address, __dlip);
+	_dl_dprintf(2, "dladdr( 0x%p, 0x%p )\n", __address, __dlip);
 #endif
 
 	for (rpnt = _dl_loaded_modules; rpnt; rpnt = rpnt->next) {
@@ -575,7 +575,7 @@ int _dladdr(void *__address, Dl_info * __dlip)
 
 		tpnt = rpnt;
 #if 0
-		_dl_fprintf(2, "Module \"%s\" at 0x%p\n", 
+		_dl_dprintf(2, "Module \"%s\" at 0x%p\n", 
 			tpnt->libname, tpnt->loadaddr);
 #endif
 		if (tpnt->loadaddr < (char *) __address
@@ -615,7 +615,7 @@ int _dladdr(void *__address, Dl_info * __dlip)
 					sf = 1;
 				}
 #if 0
-				_dl_fprintf(2, "Symbol \"%s\" at 0x%p\n", 
+				_dl_dprintf(2, "Symbol \"%s\" at 0x%p\n", 
 					strtab + symtab[si].st_name, symbol_addr);
 #endif
 			}
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 7664f3fd4..540b6640f 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -475,11 +475,11 @@ possible, but at run time the normal symbols are accessed. */
 
 static void __attribute__ ((unused)) foobar()
 {
-	_dl_fprintf(2, "libdl library not correctly linked\n");
+	_dl_dprintf(2, "libdl library not correctly linked\n");
 	_dl_exit(1);
 }
 
-asm(".weak _dl_fprintf; _dl_fprintf = foobar");
+asm(".weak _dl_dprintf; _dl_dprintf = foobar");
 asm(".weak _dl_find_hash; _dl_find_hash = foobar");
 asm(".weak _dl_load_shared_library; _dl_load_shared_library = foobar");
 asm(".weak _dl_parse_relocation_information; _dl_parse_relocation_information = foobar");
@@ -490,7 +490,7 @@ asm(".weak _dl_unmap_cache; _dl_unmap_cache = foobar");
 #endif	
 
 #if 0
-weak_alias(_dl_fprintf, foobar);
+weak_alias(_dl_dprintf, foobar);
 weak_alias(_dl_find_hash, foobar);
 weak_alias(_dl_load_shared_library, foobar);
 weak_alias(_dl_parse_relocation_information, foobar);
@@ -528,10 +528,10 @@ void _dlinfo()
 	struct elf_resolve *tpnt;
 	struct dyn_elf *rpnt, *hpnt;
 
-	_dl_fprintf(2, "List of loaded modules\n");
+	_dl_dprintf(2, "List of loaded modules\n");
 	/* First start with a complete list of all of the loaded files. */
 	for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next) { 
-		_dl_fprintf(2, "\t%x %x %x %s %d %s\n", 
+		_dl_dprintf(2, "\t%x %x %x %s %d %s\n", 
 			(unsigned) tpnt->loadaddr, (unsigned) tpnt,
 			(unsigned) tpnt->symbol_scope,
 			type[tpnt->libtype],
@@ -539,15 +539,15 @@ void _dlinfo()
 	}
 
 	/* Next dump the module list for the application itself */
-	_dl_fprintf(2, "\nModules for application (%x):\n",
+	_dl_dprintf(2, "\nModules for application (%x):\n",
 				 (unsigned) _dl_symbol_tables);
 	for (rpnt = _dl_symbol_tables; rpnt; rpnt = rpnt->next)
-		_dl_fprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, rpnt->dyn->libname);
+		_dl_dprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, rpnt->dyn->libname);
 
 	for (hpnt = _dl_handles; hpnt; hpnt = hpnt->next_handle) {
-		_dl_fprintf(2, "Modules for handle %x\n", (unsigned) hpnt);
+		_dl_dprintf(2, "Modules for handle %x\n", (unsigned) hpnt);
 		for (rpnt = hpnt; rpnt; rpnt = rpnt->next)
-			_dl_fprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, 
+			_dl_dprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, 
 				rpnt->dyn->libname);
 	}
 }
@@ -567,7 +567,7 @@ int _dladdr(void *__address, Dl_info * __dlip)
 	pelf = NULL;
 
 #if 0
-	_dl_fprintf(2, "dladdr( 0x%p, 0x%p )\n", __address, __dlip);
+	_dl_dprintf(2, "dladdr( 0x%p, 0x%p )\n", __address, __dlip);
 #endif
 
 	for (rpnt = _dl_loaded_modules; rpnt; rpnt = rpnt->next) {
@@ -575,7 +575,7 @@ int _dladdr(void *__address, Dl_info * __dlip)
 
 		tpnt = rpnt;
 #if 0
-		_dl_fprintf(2, "Module \"%s\" at 0x%p\n", 
+		_dl_dprintf(2, "Module \"%s\" at 0x%p\n", 
 			tpnt->libname, tpnt->loadaddr);
 #endif
 		if (tpnt->loadaddr < (char *) __address
@@ -615,7 +615,7 @@ int _dladdr(void *__address, Dl_info * __dlip)
 					sf = 1;
 				}
 #if 0
-				_dl_fprintf(2, "Symbol \"%s\" at 0x%p\n", 
+				_dl_dprintf(2, "Symbol \"%s\" at 0x%p\n", 
 					strtab + symtab[si].st_name, symbol_addr);
 #endif
 			}