From: Daniel Jacobowitz <drow@false.org>
Date: Tue, 11 Jul 2006 20:37:02 +0000 (+0000)
Subject:         gdb/
X-Git-Tag: gdb-csl-symbian-6_4_50_20060226-11~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef48a1a03dfaa29e252d012f7d9caeb0100f6536;p=thirdparty%2Fbinutils-gdb.git

    gdb/
        * symfile.c (symfile_section_offset_from_segment): Correct
        last change.

        * solib.c (solib_open): Always set errno.
---

diff --git a/ChangeLog.csl b/ChangeLog.csl
index be6a5463074..c892b22aa41 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,11 @@
+2006-07-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	gdb/
+	* symfile.c (symfile_section_offset_from_segment): Correct
+	last change.
+
+	* solib.c (solib_open): Always set errno.
+
 2006-07-11  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	gdb/
diff --git a/gdb/solib.c b/gdb/solib.c
index f55837694b2..d2b7b9979b8 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -153,6 +153,12 @@ solib_open (char *in_pathname, char **found_pathname)
   char *temp_pathname = NULL;
   char *p;
 
+  /* By default, return ENOENT.  We must set this explicitly because
+     we don't know whether any of the various calls to open or openp
+     below will actually be made; if none of them are, return this
+     instead of whatever errno was on entry.  */
+  errno = ENOENT;
+
   /* If solib-symbols-extension is set, replace the file's extension.  */
   if (solib_symbols_extension && *solib_symbols_extension)
     {
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 469867bcbdc..3279ec00d7c 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3882,10 +3882,11 @@ symfile_section_offset_from_segment (bfd *abfd, asection *sect,
 	   && vma < data_segment.p_vaddr + data_segment.p_memsz)
     return data_offset;
 
-  else if (bfd_get_section_size (sect) > 0)
+  else
     {
-      warning (_("Loadable segment \"%s\" outside of ELF segments"),
-	       bfd_section_name (abfd, sect));
+      if (bfd_get_section_size (sect) > 0)
+	warning (_("Loadable segment \"%s\" outside of ELF segments"),
+		 bfd_section_name (abfd, sect));
       return 0;
     }
 }