Index: objfiles.c
===================================================================
RCS file: /cvs/src/src/gdb/objfiles.c,v
retrieving revision 1.92
diff -u -p -u -r1.92 objfiles.c
--- objfiles.c	17 Aug 2009 11:16:13 -0000	1.92
+++ objfiles.c	20 Aug 2009 17:47:56 -0000
@@ -837,9 +837,10 @@ update_section_map (struct obj_section *
   map = *pmap;
   xfree (map);
 
-#define insert_p(objf, sec) \
-  ((bfd_get_section_flags ((objf)->obfd, (sec)->the_bfd_section) \
-    & SEC_THREAD_LOCAL) == 0)
+#define insert_p(objf, sec)						\
+  (section_is_mapped (sec) == 0 &&					\
+   ((bfd_get_section_flags ((objf)->obfd, (sec)->the_bfd_section)	\
+     & SEC_THREAD_LOCAL) == 0))
 
   map_size = 0;
   ALL_OBJSECTIONS (objfile, s)