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