Fix for GNUstep build failure during dumping.

* unexelf.c (unexec) [NS_IMPL_GNUSTEP]: Take account of the case
that where the value of an _OBJC_* symbol points to is in the .bss
section (Bug#10240).

diff --git a/src/ChangeLog b/src/ChangeLog
index c533b93916dc4afcd1bb1fe1645e4d92f76491a9..44f80ae4098304c0059c3c709f0c28aeaf0e9037 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * unexelf.c (unexec) [NS_IMPL_GNUSTEP]: Take account of the case
+       that where the value of an _OBJC_* symbol points to is in the .bss
+       section (Bug#10240).
+
 2011-12-08  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
        * coding.c (encode_coding_ccl): Check (charbuf < charbuf_end)

diff --git a/src/unexelf.c b/src/unexelf.c
index 04c029f7e80ba0e774d23b4f2cec9cb15457b05c..1715c3670ca2fd5f9ea33a60c28a78535fc3d31b 100644 (file)
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1219,9 +1219,15 @@ temacs:
              nn = symp->st_shndx;
              if (nn > old_bss_index)
                nn--;
-             old = ((symp->st_value - NEW_SECTION_H (symp->st_shndx).sh_addr)
-                    + OLD_SECTION_H (nn).sh_offset + old_base);
-             memcpy (new, old, symp->st_size);
+             if (nn == old_bss_index)
+               memset (new, 0, symp->st_size);
+             else
+               {
+                 old = ((symp->st_value
+                         - NEW_SECTION_H (symp->st_shndx).sh_addr)
+                        + OLD_SECTION_H (nn).sh_offset + old_base);
+                 memcpy (new, old, symp->st_size);
+               }
            }
 #endif
        }