Fix a few warnings introduced by my previous commits.

ldso/ldso/dl-hash.c

@@ -343,7 +343,7 @@ char *_dl_lookup_hash(const char *name, struct dyn_elf *rpnt,
 				if (tpntp)
 					*tpntp = tpnt;
 #endif
-				return DL_FIND_HASH_VALUE (tpnt, type_class, sym);
+				return (char *) DL_FIND_HASH_VALUE (tpnt, type_class, sym);
 			default:	/* Local symbols not handled here */
 				break;
 		}
@@ -353,7 +353,7 @@ char *_dl_lookup_hash(const char *name, struct dyn_elf *rpnt,
 		if (tpntp)
 			*tpntp = weak_tpnt;
 #endif
-		return DL_FIND_HASH_VALUE (weak_tpnt, type_class, weak_sym);
+		return (char *) DL_FIND_HASH_VALUE (weak_tpnt, type_class, weak_sym);
 	}
 #ifdef __FDPIC__
 	if (tpntp)

ldso/libdl/libdl.c

@@ -447,8 +447,8 @@ void *dlsym(void *vhandle, const char *name)
 	struct dyn_elf *rpnt;
 	void *ret;
 	/* Nastiness to support underscore prefixes.  */
-	char tmp_buf[80];
 #ifndef __UCLIBC_NO_UNDERSCORES__
+	char tmp_buf[80];
 	char *name2 = tmp_buf;
 	size_t nlen = strlen (name) + 1;
 	if (nlen + 1 > sizeof (tmp_buf))