2007-03-16 Jakub Jelinek <jakub@redhat.com>

	* elf/dl-open.c (dl_open_worker): Declare l in 2 different
	smaller scopes.
	* elf/dl-dst.h (DL_DST_REQ_STATIC): Add l as macro argument.
	(DL_DST_REQUIRED): Adjust user.

diff --git a/ChangeLog b/ChangeLog
index 619cf5e3bfa54fe6a20349a3327253b4e230bea3..76dfe796678871f67f0887f87ed19cc30249aa1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+       * elf/dl-open.c (dl_open_worker): Declare l in 2 different
+       smaller scopes.
+       * elf/dl-dst.h (DL_DST_REQ_STATIC): Add l as macro argument.
+       (DL_DST_REQUIRED): Adjust user.
+
 2007-03-15  Jakub Jelinek  <jakub@redhat.com>
 
        * locale/programs/ld-ctype.c (find_translit): Return NULL if ctype is

diff --git a/elf/dl-dst.h b/elf/dl-dst.h
index 83d16bdb0e090dcf75404111c00ceb018f409c50..37465ee2b31f3ecfc34e89a3649ac998f64b7d43 100644 (file)
--- a/elf/dl-dst.h
+++ b/elf/dl-dst.h
@@ -50,7 +50,7 @@
                                                                              \
           First get the origin string if it is not available yet.            \
           This can only happen for the map of the executable.  */            \
-       DL_DST_REQ_STATIC                                                     \
+       DL_DST_REQ_STATIC (l)                                                 \
        if ((l)->l_origin == NULL)                                            \
          {                                                                   \
            assert ((l)->l_name[0] == '\0');                                  \
@@ -68,9 +68,9 @@
     __len; })
 
 #ifdef SHARED
-# define DL_DST_REQ_STATIC /* nothing */
+# define DL_DST_REQ_STATIC(l) /* nothing */
 #else
-# define DL_DST_REQ_STATIC \
+# define DL_DST_REQ_STATIC(l) \
   if ((l) == NULL)                                                           \
     {                                                                        \
       const char *origin = _dl_get_origin ();                                \

diff --git a/elf/dl-open.c b/elf/dl-open.c
index 50c0d54f274b22f9a6412cf7cc61ce51d5aff24f..bb80e77095bc3dbca6474fc4e662c33156ec1607 100644 (file)
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -160,7 +160,7 @@ dl_open_worker (void *a)
   struct dl_open_args *args = a;
   const char *file = args->file;
   int mode = args->mode;
-  struct link_map *new, *l;
+  struct link_map *new;
   int lazy;
   unsigned int i;
 #ifdef USE_TLS
@@ -187,6 +187,7 @@ dl_open_worker (void *a)
         By default we assume this is the main application.  */
       call_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
 
+      struct link_map *l;
       for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
        for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
          if (caller_dlopen >= (const void *) l->l_map_start
@@ -326,7 +327,7 @@ dl_open_worker (void *a)
   /* Relocate the objects loaded.  We do this in reverse order so that copy
      relocs of earlier objects overwrite the data written by later objects.  */
 
-  l = new;
+  struct link_map *l = new;
   while (l->l_next)
     l = l->l_next;
   while (1)