GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-3-g06e3c8a

[jsm28 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  06e3c8a22dc63727ab09703446568754cef2ffa5 (commit)
      from  b8845523ca38bd03b2af4ab8b5b64e5055ccfd23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=06e3c8a22dc63727ab09703446568754cef2ffa5

commit 06e3c8a22dc63727ab09703446568754cef2ffa5
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue Jul 3 17:03:29 2012 +0000

    Add ppca2 to ports powerpc/dl-procinfo.

diff --git a/ports/ChangeLog.powerpc b/ports/ChangeLog.powerpc
index 0c7d3af..7141bb2 100644
--- a/ports/ChangeLog.powerpc
+++ b/ports/ChangeLog.powerpc
@@ -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
diff --git a/ports/sysdeps/powerpc/dl-procinfo.c b/ports/sysdeps/powerpc/dl-procinfo.c
index b1979ab..00cd497 100644
--- a/ports/sysdeps/powerpc/dl-procinfo.c
+++ b/ports/sysdeps/powerpc/dl-procinfo.c
@@ -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",
diff --git a/ports/sysdeps/powerpc/dl-procinfo.h b/ports/sysdeps/powerpc/dl-procinfo.h
index 785bd1b..98c3775 100644
--- a/ports/sysdeps/powerpc/dl-procinfo.h
+++ b/ports/sysdeps/powerpc/dl-procinfo.h
@@ -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))
@@ -127,6 +128,10 @@ _dl_string_platform (const char *str)
               == 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)
        return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC405;

-----------------------------------------------------------------------

Summary of changes:
 ports/ChangeLog.powerpc             |   13 +++++++++++++
 ports/sysdeps/powerpc/dl-procinfo.c |    5 +++--
 ports/sysdeps/powerpc/dl-procinfo.h |   17 +++++++++++------
 3 files changed, 27 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources