Ignore:
Timestamp:
Feb 26, 2012, 5:50:35 PM (13 years ago)
Author:
Jonathan Norman <jon@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
5b6948a
Parents:
0fadcfd (diff), 68fb4f2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged with Cosmo-branch, renamed / rediffed patches as required and fixed download links

File:
1 moved

Legend:

Unmodified
Added
Removed
  • patches/eglibc-2.15-r16526-dl_dep_fix-1.patch

    r0fadcfd r35e7499  
    1 Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 2011-04-16
    3 Initial Package Version: 2.13 r13356
     1Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
     2Date: 2012-02-26
     3Initial Package Version: 2.15 r16526
    44Origin: Andreas Schwab
    55        Via http://sourceware.org/ml/libc-hacker/2011-02/msg00002.html
     
    77Description: If a ELF binaries dependencies are missing it was causing
    88             a signal too early.
     9Rediffed by Jonathan Norman for Eglibc 2.15
    910
    10 diff -Naur eglibc-2.13.orig/elf/dl-deps.c eglibc-2.13/elf/dl-deps.c
    11 --- eglibc-2.13.orig/elf/dl-deps.c      2011-02-04 22:31:21.000000000 +0000
    12 +++ eglibc-2.13/elf/dl-deps.c   2011-04-16 23:44:34.479218974 +0000
    13 @@ -491,6 +491,10 @@
     11
     12diff -Naur eglibc-2.15.orig/elf/dl-deps.c eglibc-2.15/elf/dl-deps.c
     13--- eglibc-2.15.orig/elf/dl-deps.c      2012-02-26 17:15:55.394189832 +0000
     14+++ eglibc-2.15/elf/dl-deps.c   2012-02-26 17:21:48.882756229 +0000
     15@@ -502,6 +502,10 @@
    1416   if (errno == 0 && errno_saved != 0)
    1517     __set_errno (errno_saved);
     
    1719+  if (errno_reason)
    1820+    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
    19 +                     NULL, errstring);
     21+                     NULL, errstring);
    2022+
    2123   struct link_map **old_l_initfini = NULL;
    2224   if (map->l_initfini != NULL && map->l_type == lt_loaded)
    2325     {
    24 @@ -683,8 +687,4 @@
    25      }
     26@@ -699,7 +703,4 @@
    2627   if (old_l_initfini != NULL)
    27      _dl_scope_free (old_l_initfini);
    28 -
     28       map->l_orig_initfini = old_l_initfini;
     29 
    2930-  if (errno_reason)
    3031-    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
Note: See TracChangeset for help on using the changeset viewer.