← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/hurd-i386/tg-_dl_random.diff/sysdeps/mach/hurd/dl-sysdep.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:
.pc/hurd-i386/tg-_dl_random.diff/sysdeps/mach/hurd/dl-sysdep.c
646
646
}
647
647
 
648
648
 
649
 
/* Return an array of useful/necessary hardware capability names.  */
650
 
const struct r_strlenpair *
651
 
internal_function
652
 
_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
653
 
                      size_t *max_capstrlen)
654
 
{
655
 
  struct r_strlenpair *result;
656
 
 
657
 
  /* Return an empty array.  Hurd has no hardware capabilities.  */
658
 
  result = (struct r_strlenpair *) malloc (sizeof (*result));
659
 
  if (result == NULL)
660
 
    _dl_signal_error (ENOMEM, NULL, NULL, "cannot create capability list");
661
 
 
662
 
  result[0].str = (char *) result;      /* Does not really matter.  */
663
 
  result[0].len = 0;
664
 
 
665
 
  *sz = 1;
666
 
  return result;
667
 
}
668
 
 
669
649
void weak_function
670
650
_dl_init_first (int argc, ...)
671
651
{