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