← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sysdeps/generic/unwind-dw2-fde-glibc.c

  • 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:
sysdeps/generic/unwind-dw2-fde-glibc.c
1
 
/* Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc.
 
1
/* Copyright (C) 2001-2012 Free Software Foundation, Inc.
2
2
   Contributed by Jakub Jelinek <jakub@redhat.com>.
3
3
 
4
4
   This file is part of the GNU C Library.
85
85
_Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
86
86
{
87
87
  struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr;
88
 
  const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic;
 
88
  const ElfW(Phdr) *phdr, *p_eh_frame_hdr;
 
89
  const ElfW(Phdr) *p_dynamic __attribute__ ((unused));
89
90
  long n, match;
90
91
  _Unwind_Ptr load_base;
91
92
  const unsigned char *p;