]> git.pld-linux.org Git - packages/glibc.git/commitdiff
- fix asserion when running /lib/libc-*.so
authorwolf <wolf@pld-linux.org>
Sun, 16 Nov 2003 13:37:44 +0000 (13:37 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    glibc-fix-asserts.patch -> 1.1

glibc-fix-asserts.patch [new file with mode: 0644]

diff --git a/glibc-fix-asserts.patch b/glibc-fix-asserts.patch
new file mode 100644 (file)
index 0000000..256270e
--- /dev/null
@@ -0,0 +1,24 @@
+diff -Naur glibc-2.3-20031101.orig/elf/rtld.c glibc-2.3-20031101/elf/rtld.c
+--- glibc-2.3-20031101.orig/elf/rtld.c 2003-11-01 23:47:33.236533536 +0200
++++ glibc-2.3-20031101/elf/rtld.c      2003-11-02 00:19:16.053261424 +0200
+@@ -1237,19 +1237,7 @@
+       while (GL(dl_loaded)->l_searchlist.r_list[i] != &GL(dl_rtld_map))
+       ++i;
+       GL(dl_rtld_map).l_prev = GL(dl_loaded)->l_searchlist.r_list[i - 1];
+-      if (__builtin_expect (mode, normal) == normal)
+-      GL(dl_rtld_map).l_next = (i + 1 < GL(dl_loaded)->l_searchlist.r_nlist
+-                                ? GL(dl_loaded)->l_searchlist.r_list[i + 1]
+-                                : NULL);
+-      else
+-      /* In trace mode there might be an invisible object (which we
+-         could not find) after the previous one in the search list.
+-         In this case it doesn't matter much where we put the
+-         interpreter object, so we just initialize the list pointer so
+-         that the assertion below holds.  */
+-      GL(dl_rtld_map).l_next = GL(dl_rtld_map).l_prev->l_next;
+-
+-      assert (GL(dl_rtld_map).l_prev->l_next == GL(dl_rtld_map).l_next);
++      GL(dl_rtld_map).l_next = GL(dl_rtld_map).l_prev->l_next;
+       GL(dl_rtld_map).l_prev->l_next = &GL(dl_rtld_map);
+       if (GL(dl_rtld_map).l_next != NULL)
+       {
This page took 0.047131 seconds and 4 git commands to generate.