00db10
From 6edf51a1d5d2f070998553f99f3a6dc90c5c2969 Mon Sep 17 00:00:00 2001
00db10
From: Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>
00db10
Date: Wed, 19 Aug 2015 01:42:55 -0300
00db10
Subject: [PATCH] powerpc: Sync hwcap.h with kernel
00db10
00db10
Linux commit b4b56f9ecab40f3b4ef53e130c9f6663be491894 introduced
00db10
a new HWCAP2 bit to indicate that the kernel now aborts a memory
00db10
transaction when a syscall is made.  This patch adds that bit to
00db10
sysdeps/powerpc/bits/hwcap.h.
00db10
00db10
2015-08-26  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
00db10
00db10
	* sysdeps/powerpc/bits/hwcap.h: Add PPC_FEATURE2_HTM_NOSC.
00db10
	* sysdeps/powerpc/dl-procinfo.c:
00db10
	(_dl_powerpc_cap_flags): Added descriptor for this hwcap
00db10
	feature so it shows when LD_SHOW_AUXV=1.
00db10
00db10
(cherry picked from commit 3c13f28c8eac1e5a883d1b3801314430a094fc99)
00db10
---
00db10
 ChangeLog                     | 7 +++++++
00db10
 sysdeps/powerpc/bits/hwcap.h  | 2 ++
00db10
 sysdeps/powerpc/dl-procinfo.c | 2 +-
00db10
 3 files changed, 10 insertions(+), 1 deletion(-)
00db10
00db10
diff --git a/ChangeLog b/ChangeLog
00db10
index d9d3659..079da2a 100644
00db10
diff --git a/sysdeps/powerpc/bits/hwcap.h b/sysdeps/powerpc/bits/hwcap.h
00db10
index f8c48cd..12554ca 100644
00db10
--- a/sysdeps/powerpc/bits/hwcap.h
00db10
+++ b/sysdeps/powerpc/bits/hwcap.h
00db10
@@ -64,3 +64,5 @@
00db10
 #define PPC_FEATURE2_HAS_TAR       0x04000000 /* Target Address Register */
00db10
 #define PPC_FEATURE2_HAS_VEC_CRYPTO  0x02000000  /* Target supports vector
00db10
 						    instruction.  */
00db10
+#define PPC_FEATURE2_HTM_NOSC	   0x01000000 /* Kernel aborts transaction
00db10
+						 when a syscall is made.  */
00db10
diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c
00db10
index 6eda5d9..770c1f3 100644
00db10
--- a/sysdeps/powerpc/dl-procinfo.c
00db10
+++ b/sysdeps/powerpc/dl-procinfo.c
00db10
@@ -62,7 +62,7 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[60][10]
00db10
     "", "", "", "",
00db10
     "", "", "", "",
00db10
     "", "", "", "",
00db10
-    "", "vcrypto", "tar", "isel",
00db10
+    "htm-nosc", "vcrypto", "tar", "isel",
00db10
     "ebb", "dscr", "htm", "arch_2_07",
00db10
   }
00db10
 #endif
00db10
-- 
00db10
2.1.0
00db10