← Back to branch summary

~ubuntu-branches/ubuntu/saucy/eglibc/saucy

« back to all changes in this revision

Viewing changes to ports/sysdeps/powerpc/dl-procinfo.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:
ports/sysdeps/powerpc/dl-procinfo.c
1
1
/* Data for processor capability information.  PowerPC version.
2
 
   Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
 
2
   Copyright (C) 2005-2012 Free Software Foundation, Inc.
3
3
   This file is part of the GNU C Library.
4
4
 
5
5
   The GNU C Library is free software; you can redistribute it and/or
67
67
#if !defined PROCINFO_DECL && defined SHARED
68
68
  ._dl_powerpc_platforms
69
69
#else
70
 
PROCINFO_CLASS const char _dl_powerpc_platforms[12][12]
 
70
PROCINFO_CLASS const char _dl_powerpc_platforms[13][12]
71
71
#endif
72
72
#ifndef PROCINFO_DECL
73
73
= {
79
79
    [PPC_PLATFORM_CELL_BE] = "ppc-cell-be",
80
80
    [PPC_PLATFORM_POWER6X] = "power6x",
81
81
    [PPC_PLATFORM_POWER7] = "power7",
 
82
    [PPC_PLATFORM_PPCA2] = "ppca2",
82
83
    [PPC_PLATFORM_PPC405] = "ppc405",
83
84
    [PPC_PLATFORM_PPC440] = "ppc440",
84
85
    [PPC_PLATFORM_PPC464] = "ppc464",