← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to debian/patches/any/unsubmitted-ldso-machine-mismatch.diff

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/any/unsubmitted-ldso-machine-mismatch.diff
 
1
--- glibc/elf/dl-load.c 2013-01-23 20:55:08.648614327 -0700
 
2
+++ glibc/elf/dl-load.c 2013-01-23 20:55:52.852612764 -0700
 
3
@@ -2008,6 +2008,12 @@
 
4
              goto close_and_out;
 
5
            }
 
6
 #endif
 
7
+         else if (! __builtin_expect (elf_machine_matches_host (ehdr), 1))
 
8
+           {
 
9
+             /* Another non-fatal error, let's skip right past the
 
10
+                the libraries obviously built for other machines.  */
 
11
+             goto close_and_out;
 
12
+           }
 
13
          else if (ehdr->e_ident[EI_DATA] != byteorder)
 
14
            {
 
15
              if (BYTE_ORDER == BIG_ENDIAN)