* sunrpc/clnt_udp.c (__libc_clntudp_bufcreate): Namespace cleanup.

	* elf/dl-load.c (local_strdup): Remove inline.
	(_dl_map_object_from_fd): Don't allocate l_symbolic_searchlist.r_list.
	* elf/dl-object.c (_dl_new_object): Allocate symbolic searchlist as
	part of the object.

	* sysdeps/unix/sysv/linux/dl-origin.c: Add const to avoid warning.

5 files changed, 20 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index fdacf462c8..be35b3f2c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* sunrpc/clnt_udp.c (__libc_clntudp_bufcreate): Namespace cleanup.
+
+	* elf/dl-load.c (local_strdup): Remove inline.
+	(_dl_map_object_from_fd): Don't allocate l_symbolic_searchlist.r_list.
+	* elf/dl-object.c (_dl_new_object): Allocate symbolic searchlist as
+	part of the object.
+
+	* sysdeps/unix/sysv/linux/dl-origin.c: Add const to avoid warning.
+
 2008-07-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h: IA-64 and SPARC have
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 94531b271f..8a8936f7bd 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -163,7 +163,7 @@ static const size_t system_dirs_len[] =
 
 
 /* Local version of `strdup' function.  */
-static inline char *
+static char *
 local_strdup (const char *s)
 {
   size_t len = strlen (s) + 1;
@@ -1470,15 +1470,6 @@ cannot enable executable stack as shared object requires");
     {
       /* Create an appropriate searchlist.  It contains only this map.
 	 This is the definition of DT_SYMBOLIC in SysVr4.  */
-      l->l_symbolic_searchlist.r_list =
-	(struct link_map **) malloc (sizeof (struct link_map *));
-
-      if (l->l_symbolic_searchlist.r_list == NULL)
-	{
-	  errstring = N_("cannot create searchlist");
-	  goto call_lose_errno;
-	}
-
       l->l_symbolic_searchlist.r_list[0] = l;
       l->l_symbolic_searchlist.r_nlist = 1;
 
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 0e45aea39b..7780de6304 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -50,13 +50,17 @@ _dl_new_object (char *realname, const char *libname, int type,
 #endif
 
   new = (struct link_map *) calloc (sizeof (*new) + audit_space
+				    + sizeof (struct r_scope_elem)
 				    + sizeof (*newname) + libname_len, 1);
   if (new == NULL)
     return NULL;
 
   new->l_real = new;
-  new->l_libname = newname = (struct libname_list *) ((char *) (new + 1)
-						      + audit_space);
+  new->l_symbolic_searchlist.r_list = (struct link_map **) ((char *) (new + 1)
+							    + audit_space);
+
+  new->l_libname = newname
+    = (struct libname_list *) (new->l_symbolic_searchlist.r_list + 1);
   newname->name = (char *) memcpy (newname + 1, libname, libname_len);
   /* newname->next = NULL;	We use calloc therefore not necessary.  */
   newname->dont_free = 1;
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index e3a68129ec..548c987e69 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -202,7 +202,7 @@ __libc_clntudp_bufcreate (struct sockaddr_in *raddr, u_long program,
 	  *sockp = __socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 # ifdef SOCK_CLOEXEC
 	  if (flags & SOCK_CLOEXEC)
-	    fcntl (*sockp, F_SETFD, FD_CLOEXEC);
+	    __fcntl (*sockp, F_SETFD, FD_CLOEXEC);
 # endif
 	}
 #endif
diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c
index 5dacec60d9..fdb6372f09 100644
--- a/sysdeps/unix/sysv/linux/dl-origin.c
+++ b/sysdeps/unix/sysv/linux/dl-origin.c
@@ -38,7 +38,7 @@ _dl_get_origin (void)
 #ifndef __ASSUME_AT_EXECFN
   char linkval[PATH_MAX];
 #endif
-  char *str;
+  const char *str;
   char *result = (char *) -1l;
   int len;