aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Eduardo Seo <cseo@linux.vnet.ibm.com>2016-10-14 16:57:32 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-10-14 16:57:32 -0300
commit771fb81f98a2be9e96f2a09056617ad93d64959f (patch)
tree7de1cbc86b15a0e311a7f09b05b0030ce7add178
parenta4c507f0eb3ae565fb693ec1f41c0b3af24c4010 (diff)
downloadglibc-771fb81f98a2be9e96f2a09056617ad93d64959f.zip
glibc-771fb81f98a2be9e96f2a09056617ad93d64959f.tar.gz
glibc-771fb81f98a2be9e96f2a09056617ad93d64959f.tar.bz2
powerpc: Sync hwcap.h with kernel
Linux commit b4b56f9ecab40f3b4ef53e130c9f6663be491894 introduced a new HWCAP2 bit to indicate that the kernel now aborts a memory transaction when a syscall is made. This patch adds that bit to sysdeps/powerpc/bits/hwcap.h. * sysdeps/powerpc/bits/hwcap.h: Add PPC_FEATURE2_HTM_NOSC. * sysdeps/powerpc/dl-procinfo.c: (_dl_powerpc_cap_flags): Added descriptor for this hwcap feature so it shows when LD_SHOW_AUXV=1. (cherry picked from commit 3c13f28c8eac1e5a883d1b3801314430a094fc99)
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/powerpc/bits/hwcap.h2
-rw-r--r--sysdeps/powerpc/dl-procinfo.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d377079..c5389fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2016-10-14 Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>
+ * sysdeps/powerpc/bits/hwcap.h: Add PPC_FEATURE2_HTM_NOSC.
+ * sysdeps/powerpc/dl-procinfo.c:
+ (_dl_powerpc_cap_flags): Added descriptor for this hwcap
+ feature so it shows when LD_SHOW_AUXV=1.
+
+2016-10-14 Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>
+
* sysdeps/powerpc/dl-procinfo.c:
(_dl_powerpc_cap_flags): Added missing strings for some
hwcap features.
diff --git a/sysdeps/powerpc/bits/hwcap.h b/sysdeps/powerpc/bits/hwcap.h
index f8c48cd..12554ca 100644
--- a/sysdeps/powerpc/bits/hwcap.h
+++ b/sysdeps/powerpc/bits/hwcap.h
@@ -64,3 +64,5 @@
#define PPC_FEATURE2_HAS_TAR 0x04000000 /* Target Address Register */
#define PPC_FEATURE2_HAS_VEC_CRYPTO 0x02000000 /* Target supports vector
instruction. */
+#define PPC_FEATURE2_HTM_NOSC 0x01000000 /* Kernel aborts transaction
+ when a syscall is made. */
diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c
index 6eda5d9..770c1f3 100644
--- a/sysdeps/powerpc/dl-procinfo.c
+++ b/sysdeps/powerpc/dl-procinfo.c
@@ -62,7 +62,7 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[60][10]
"", "", "", "",
"", "", "", "",
"", "", "", "",
- "", "vcrypto", "tar", "isel",
+ "htm-nosc", "vcrypto", "tar", "isel",
"ebb", "dscr", "htm", "arch_2_07",
}
#endif