Add ppca2 to ports powerpc/dl-procinfo.

This commit is contained in:
Joseph Myers 2012-07-03 17:03:29 +00:00
parent b8845523ca
commit 06e3c8a22d
3 changed files with 27 additions and 8 deletions

View File

@ -1,3 +1,16 @@
2012-07-03 Joseph Myers <joseph@codesourcery.com>
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platforms): Add
"ppca2".
* sysdeps/powerpc/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increase to
13.
(PPC_PLATFORM_PPCA2): Define.
(PPC_PLATFORM_PPC405): Increase value.
(PPC_PLATFORM_PPC440): Likewise.
(PPC_PLATFORM_PPC464): Likewise.
(PPC_PLATFORM_PPC476): Likewise.
(_dl_string_platform): Handle ppca2.
2012-06-13 Joseph Myers <joseph@codesourcery.com>
* data/localplt-powerpcsoft-linux-gnu.data: Allow abort and

View File

@ -1,5 +1,5 @@
/* Data for processor capability information. PowerPC version.
Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
Copyright (C) 2005-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -67,7 +67,7 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[25][10]
#if !defined PROCINFO_DECL && defined SHARED
._dl_powerpc_platforms
#else
PROCINFO_CLASS const char _dl_powerpc_platforms[12][12]
PROCINFO_CLASS const char _dl_powerpc_platforms[13][12]
#endif
#ifndef PROCINFO_DECL
= {
@ -79,6 +79,7 @@ PROCINFO_CLASS const char _dl_powerpc_platforms[12][12]
[PPC_PLATFORM_CELL_BE] = "ppc-cell-be",
[PPC_PLATFORM_POWER6X] = "power6x",
[PPC_PLATFORM_POWER7] = "power7",
[PPC_PLATFORM_PPCA2] = "ppca2",
[PPC_PLATFORM_PPC405] = "ppc405",
[PPC_PLATFORM_PPC440] = "ppc440",
[PPC_PLATFORM_PPC464] = "ppc464",

View File

@ -1,5 +1,5 @@
/* Processor capability information handling macros. PowerPC version.
Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
Copyright (C) 2005-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -30,7 +30,7 @@
#define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \
+ PPC_FEATURE_HAS_DFP)
#define _DL_PLATFORMS_COUNT 12
#define _DL_PLATFORMS_COUNT 13
#define _DL_FIRST_PLATFORM 32
/* Mask to filter out platforms. */
@ -46,10 +46,11 @@
#define PPC_PLATFORM_CELL_BE 5
#define PPC_PLATFORM_POWER6X 6
#define PPC_PLATFORM_POWER7 7
#define PPC_PLATFORM_PPC405 8
#define PPC_PLATFORM_PPC440 9
#define PPC_PLATFORM_PPC464 10
#define PPC_PLATFORM_PPC476 11
#define PPC_PLATFORM_PPCA2 8
#define PPC_PLATFORM_PPC405 9
#define PPC_PLATFORM_PPC440 10
#define PPC_PLATFORM_PPC464 11
#define PPC_PLATFORM_PPC476 12
static inline const char *
__attribute__ ((unused))
@ -126,6 +127,10 @@ _dl_string_platform (const char *str)
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_CELL_BE] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_CELL_BE;
else if (strcmp (str + 3,
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPCA2] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPCA2;
else if (strcmp (str + 3,
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC405] + 3)
== 0)