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