* ldlang.c (lookup_name): Delete dead code. Remove FIXMEs.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index cacf8fa5950758ed52ee23035b01dc5b41a4e02e..ef759d6010cfba61a1cdfe298918af07f21db8ea 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+       * ldlang.c (lookup_name): Delete dead code.  Remove FIXMEs.
+
 2006-06-03  Alan Modra  <amodra@bigpond.net.au>
 
        * emultempl/elf32.em (global_found): Make it a pointer.

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 7b026b0f6b969d574325b858e7a140fd0ba9f6e2..e7fa5c7f44e4437cdef673aba0ceb17bd518c29d 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2214,12 +2214,9 @@ lookup_name (const char *name)
       /* Use the local_sym_name as the name of the file that has
         already been loaded as filename might have been transformed
         via the search directory lookup mechanism.  */
-      const char * filename = search->local_sym_name;
+      const char *filename = search->local_sym_name;
 
-      if (filename == NULL && name == NULL)
-       return search;
       if (filename != NULL
-         && name != NULL
          && strcmp (filename, name) == 0)
        break;
     }
@@ -2229,11 +2226,8 @@ lookup_name (const char *name)
                        default_target, FALSE);
 
   /* If we have already added this file, or this file is not real
-     (FIXME: can that ever actually happen?) or the name is NULL
-     (FIXME: can that ever actually happen?) don't add this file.  */
-  if (search->loaded
-      || ! search->real
-      || search->filename == NULL)
+     don't add this file.  */
+  if (search->loaded || !search->real)
     return search;
 
   if (! load_symbols (search, NULL))