backport: ppc-auxv.h (PPC_FEATURE2_HTM_NO_SUSPEND): New define.

gcc/
	Backport from mainline
	2017-12-13  Peter Bergner  <bergner@vnet.ibm.com>

	* config/rs6000/ppc-auxv.h (PPC_FEATURE2_HTM_NO_SUSPEND): New define.
	* config/rs6000/rs6000.c (cpu_supports_info): Use it.

gcc/testsuite/
	Backport from mainline
	2017-12-13  Peter Bergner  <bergner@vnet.ibm.com>

	* gcc.target/powerpc/cpu-builtin-1.c (htm-no-suspend): Add test.

From-SVN: r255672

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 256ba2563d19f8794711b9ef2ad9ec631d8a191d..8aed1e5e93637305375023b463f29141adfd8af5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-12-14  Peter Bergner  <bergner@vnet.ibm.com>
+
+       Backport from mainline
+       2017-12-13  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * config/rs6000/ppc-auxv.h (PPC_FEATURE2_HTM_NO_SUSPEND): New define.
+       * config/rs6000/rs6000.c (cpu_supports_info): Use it.
+
 2017-12-14  Peter Bergner  <bergner@vnet.ibm.com>
 
        Backport from mainline

diff --git a/gcc/config/rs6000/ppc-auxv.h b/gcc/config/rs6000/ppc-auxv.h
index c10c336d0b2414d125ab57486aab184b5c0ec7c9..81ef00d99d60946cac445ce7a7d7430d1dab022f 100644 (file)
--- a/gcc/config/rs6000/ppc-auxv.h
+++ b/gcc/config/rs6000/ppc-auxv.h
@@ -91,6 +91,7 @@
 #define PPC_FEATURE2_HAS_IEEE128    0x00400000
 #define PPC_FEATURE2_DARN           0x00200000
 #define PPC_FEATURE2_SCV            0x00100000
+#define PPC_FEATURE2_HTM_NO_SUSPEND 0x00080000
 
 
 /* Thread Control Block (TCB) offsets of the AT_PLATFORM, AT_HWCAP and

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 0f2e603a105cb4152ab54b4e68fcc20f7258bd0a..8bfc94ec3d476399498bdefd5c2efa5f927c4402 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -361,6 +361,7 @@ static const struct
   { "ebb",             PPC_FEATURE2_HAS_EBB,           1 },
   { "htm",             PPC_FEATURE2_HAS_HTM,           1 },
   { "htm-nosc",                PPC_FEATURE2_HTM_NOSC,          1 },
+  { "htm-no-suspend",  PPC_FEATURE2_HTM_NO_SUSPEND,    1 },
   { "isel",            PPC_FEATURE2_HAS_ISEL,          1 },
   { "tar",             PPC_FEATURE2_HAS_TAR,           1 },
   { "vcrypto",         PPC_FEATURE2_HAS_VEC_CRYPTO,    1 },

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d6555fb38b4c5cbcf8652337d81ff9969002f807..9cd07f37dd9e680eaa3102bca2a03352120fc5fe 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2017-12-14  Peter Bergner  <bergner@vnet.ibm.com>
+
+       Backport from mainline
+       2017-12-13  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * gcc.target/powerpc/cpu-builtin-1.c (htm-no-suspend): Add test.
+
 2017-12-14  Peter Bergner  <bergner@vnet.ibm.com>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.target/powerpc/cpu-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/cpu-builtin-1.c
index 8a1f7c86013bd8f9d3314bbde5e11b857e75fb2c..928131b52ce74f573eab13dc99d0274bb8c0314c 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/cpu-builtin-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/cpu-builtin-1.c
@@ -73,6 +73,7 @@ use_cpu_supports_builtins (unsigned int *p)
   p[37] = __builtin_cpu_supports ("vsx");
   p[38] = __builtin_cpu_supports ("darn");
   p[39] = __builtin_cpu_supports ("scv");
+  p[40] = __builtin_cpu_supports ("htm-no-suspend");
 #else
   p[0] = 0;
 #endif