* emultempl/spuelf.em (embedded_spu_file): Test for NULL path

	before calling base_name, not after.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 96158f67f68077dc01e16e3213a2c54220728d18..bf73bb479390599f4b6f4e94a69f6985a083f200 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-12  Alan Modra  <amodra@bigpond.net.au>
+
+       * emultempl/spuelf.em (embedded_spu_file): Test for NULL path
+       before calling base_name, not after.
+
 2007-07-10  Alan Modra  <amodra@bigpond.net.au>
 
        * scripttempl/elf.sc (DISCARDED): Renamed from STACKNOTE.  Add

diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index abcb6b5bcdf79556f58e35edf60c86ef35e5c493..2235143bd2b579c636ab996b4a966dd11e900701 100644 (file)
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -345,19 +345,19 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags)
   for (search = (lang_input_statement_type *) input_file_chain.head;
        search != NULL;
        search = (lang_input_statement_type *) search->next_real_file)
-    {
-      const char *infile = base_name (search->filename);
+    if (search->filename != NULL)
+      {
+       const char *infile = base_name (search->filename);
 
-      if (infile != NULL
-         && strncmp (infile, "crtbegin", 8) == 0)
-       {
-         if (infile[8] == 'S')
-           flags = concat (flags, " -fPIC", NULL);
-         else if (infile[8] == 'T')
-           flags = concat (flags, " -fpie", NULL);
-         break;
-       }
-    }
+       if (strncmp (infile, "crtbegin", 8) == 0)
+         {
+           if (infile[8] == 'S')
+             flags = concat (flags, " -fPIC", NULL);
+           else if (infile[8] == 'T')
+             flags = concat (flags, " -fpie", NULL);
+           break;
+         }
+      }
 
   /* Use fork() and exec() rather than system() so that we don't
      need to worry about quoting args.  */