2013-07-29 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>

	* config/s390/target.h (htm_begin, htm_commit, htm_abort)
	(htm_transaction_active): Enable zEC12 instructions in the
	assembler.
	* configure.tgt: Remove -Wa,-march=zEC12 from XCFLAGS.

From-SVN: r201301

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 3e9a70679792aa6d662f1f4518c68c7e65395c48..dd558c00c14aae22873d7f7b9358e9ca9dc3a27d 100644 (file)
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-29  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * config/s390/target.h (htm_begin, htm_commit, htm_abort)
+       (htm_transaction_active): Enable zEC12 instructions in the
+       assembler.
+       * configure.tgt: Remove -Wa,-march=zEC12 from XCFLAGS.
+
 2013-07-17  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * acinclude.m4: Add htm asm check for s390.

diff --git a/libitm/config/s390/target.h b/libitm/config/s390/target.h
index 17228f844dd702cacc11534de03eb5207dc4e340..cec49cf77745a2e3abddbf782a2da3ea27402657 100644 (file)
--- a/libitm/config/s390/target.h
+++ b/libitm/config/s390/target.h
@@ -85,6 +85,7 @@ htm_init ()
 static inline uint32_t
 htm_begin ()
 {
+  __asm volatile (".machine \"all\"  \n\t");
   return __builtin_tbegin_nofloat (NULL);
 }
 
@@ -97,12 +98,14 @@ htm_begin_success (uint32_t begin_ret)
 static inline void
 htm_commit ()
 {
+  __asm volatile (".machine \"all\"  \n\t");
   __builtin_tend ();
 }
 
 static inline void
 htm_abort ()
 {
+  __asm volatile (".machine \"all\"  \n\t");
   __builtin_tabort (_HTM_FIRST_USER_ABORT_CODE);
 }
 
@@ -115,6 +118,7 @@ htm_abort_should_retry (uint32_t begin_ret)
 static inline bool
 htm_transaction_active ()
 {
+  __asm volatile (".machine \"all\"  \n\t");
   return __builtin_tx_nesting_depth() != 0;
 }
 

diff --git a/libitm/configure.tgt b/libitm/configure.tgt
index 4dc2807cfe52e36f9430c0acd67fd0e78b91ec04..5078455975cd97793127724c01b767f842897737 100644 (file)
--- a/libitm/configure.tgt
+++ b/libitm/configure.tgt
@@ -109,7 +109,7 @@ case "${target_cpu}" in
        ARCH=x86
        ;;
   s390|s390x)
-       XCFLAGS="${XCFLAGS} -mzarch -mhtm -Wa,-march=zEC12"
+       XCFLAGS="${XCFLAGS} -mzarch -mhtm"
        ARCH=s390
        ;;