Changeset 73ace20 for patches/eglibc-2.15-r16526-dl_dep_fix-1.patch

Timestamp:

Oct 10, 2012, 6:42:21 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (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:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

File:

• patches/eglibc-2.15-r16526-dl_dep_fix-1.patch (moved) (moved from patches/eglibc-2.13-r13356-dl_dep_fix-1.patch ) (3 diffs)

patches/eglibc-2.15-r16526-dl_dep_fix-1.patch

@@ -1 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2011-04-16
-Initial Package Version: 2.13 r13356
+Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
+Date: 2012-02-26
+Initial Package Version: 2.15 r16526
 Origin: Andreas Schwab
         Via http://sourceware.org/ml/libc-hacker/2011-02/msg00002.html
@@ -7 +7 @@
 Description: If a ELF binaries dependencies are missing it was causing
              a signal too early.
+Rediffed by Jonathan Norman for Eglibc 2.15
 
-diff -Naur eglibc-2.13.orig/elf/dl-deps.c eglibc-2.13/elf/dl-deps.c
---- eglibc-2.13.orig/elf/dl-deps.c      2011-02-04 22:31:21.000000000 +0000
-+++ eglibc-2.13/elf/dl-deps.c   2011-04-16 23:44:34.479218974 +0000
-@@ -491,6 +491,10 @@
+
+diff -Naur eglibc-2.15.orig/elf/dl-deps.c eglibc-2.15/elf/dl-deps.c
+--- eglibc-2.15.orig/elf/dl-deps.c      2012-02-26 17:15:55.394189832 +0000
++++ eglibc-2.15/elf/dl-deps.c   2012-02-26 17:21:48.882756229 +0000
+@@ -502,6 +502,10 @@
    if (errno == 0 && errno_saved != 0)
      __set_errno (errno_saved);
@@ -17 +19 @@
 +  if (errno_reason)
 +    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
-+                     NULL, errstring);
++                     NULL, errstring);
 +
    struct link_map **old_l_initfini = NULL;
    if (map->l_initfini != NULL && map->l_type == lt_loaded)
      {
-@@ -683,8 +687,4 @@
-     }
+@@ -699,7 +703,4 @@
    if (old_l_initfini != NULL)
-     _dl_scope_free (old_l_initfini);
--
+       map->l_orig_initfini = old_l_initfini;
+ 
 -  if (errno_reason)
 -    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,