* targets.c (bfd_target_list): Don't return the default target twice.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c56f0ec..9da22b6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-21  Alan Modra  <amodra@bigpond.net.au>
+
+       * targets.c (bfd_target_list): Don't return the default target twice.
+
 2002-10-21  Elias Athanasopoulos  <eathan@otenet.gr>
 
        * archive.c (_bfd_archive_bsd_update_armap_timestamp): Replace

diff --git a/bfd/targets.c b/bfd/targets.c
index adc8bd6..5d778c8 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1273,14 +1273,17 @@ bfd_target_list ()
     vec_length++;
 
   amt = (vec_length + 1) * sizeof (char **);
-  name_ptr = name_list = (const char **) bfd_zmalloc (amt);
+  name_ptr = name_list = (const char **) bfd_malloc (amt);
 
   if (name_list == NULL)
     return NULL;
 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)
-    *(name_ptr++) = (*target)->name;
+    if (target == &bfd_target_vector[0]
+       || *target != bfd_target_vector[0])
+      *name_ptr++ = (*target)->name;
 
+  *name_ptr = NULL;
   return name_list;
 }