00db10
From de9b90366c27db80777d5099e4b22298f0b61a29 Mon Sep 17 00:00:00 2001
00db10
From: Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>
00db10
Date: Thu, 13 Aug 2015 14:33:06 -0300
00db10
Subject: [PATCH] powerpc: Add missing hwcap strings.
00db10
00db10
Some features in hwcap.h do not have matching string descriptors
00db10
to be displayed when LD_SHOW_AUXV=1.  This patch fixes the problem.
00db10
00db10
2015-08-13  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
00db10
00db10
	* sysdeps/powerpc/dl-procinfo.c:
00db10
	(_dl_powerpc_cap_flags): Added missing strings for some
00db10
	hwcap features.
00db10
	* sysdeps/powerpc/dl-procinfo.h: Updated hwcap bit count.
00db10
00db10
(cherry picked from commit 94ec7e007f4845de284d4f7569721b225ba77572)
00db10
---
00db10
 ChangeLog                     | 7 +++++++
00db10
 sysdeps/powerpc/dl-procinfo.c | 6 +++---
00db10
 sysdeps/powerpc/dl-procinfo.h | 4 ++--
00db10
 3 files changed, 12 insertions(+), 5 deletions(-)
00db10
00db10
diff --git a/ChangeLog b/ChangeLog
00db10
index 5cbd6d6..d9d3659 100644
00db10
diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c
00db10
index 3a8cc41..6eda5d9 100644
00db10
--- a/sysdeps/powerpc/dl-procinfo.c
00db10
+++ b/sysdeps/powerpc/dl-procinfo.c
00db10
@@ -45,11 +45,11 @@
00db10
 #if !defined PROCINFO_DECL && defined SHARED
00db10
   ._dl_powerpc_cap_flags
00db10
 #else
00db10
-PROCINFO_CLASS const char _dl_powerpc_cap_flags[57][10]
00db10
+PROCINFO_CLASS const char _dl_powerpc_cap_flags[60][10]
00db10
 #endif
00db10
 #ifndef PROCINFO_DECL
00db10
 = {
00db10
-    "vsx", 
00db10
+    "ppcle", "true_le", "archpmu", "vsx",
00db10
     "arch_2_06", "power6x", "dfp", "pa6t",
00db10
     "arch_2_05", "ic_snoop", "smt", "booke",
00db10
     "cellbe", "power5+", "power5", "power4",
00db10
@@ -62,7 +62,7 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[57][10]
00db10
     "", "", "", "",
00db10
     "", "", "", "",
00db10
     "", "", "", "",
00db10
-    "", "", "tar", "isel",
00db10
+    "", "vcrypto", "tar", "isel",
00db10
     "ebb", "dscr", "htm", "arch_2_07",
00db10
   }
00db10
 #endif
00db10
diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
00db10
index cf167b0..36873cf 100644
00db10
--- a/sysdeps/powerpc/dl-procinfo.h
00db10
+++ b/sysdeps/powerpc/dl-procinfo.h
00db10
@@ -22,8 +22,8 @@
00db10
 #include <ldsodefs.h>
00db10
 #include <sysdep.h>	/* This defines the PPC_FEATURE[2]_* macros.  */
00db10
 
00db10
-/* There are 25 bits used, but they are bits 7..31.  */
00db10
-#define _DL_HWCAP_FIRST		7
00db10
+/* There are 28 bits used, but they are bits 4..31.  */
00db10
+#define _DL_HWCAP_FIRST		4
00db10
 
00db10
 /* The total number of available bits (including those prior to
00db10
    _DL_HWCAP_FIRST).  Some of these bits might not be used.  */
00db10
-- 
00db10
2.1.0
00db10