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

libitm/ChangeLog

+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.

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;
 }
 

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
 	;;