acinclude.m4: Move s390* case from RTM to HTM check.

2014-04-14  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* acinclude.m4: Move s390* case from RTM to HTM check.
	* configure: Regenerate.

From-SVN: r209370

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index b17cffdb994655bb61e7becfc59197fbabd8ca69..317b308384165816f1e9f44c42eb23234bd5bebd 100644 (file)
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-14  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * acinclude.m4: Move s390* case from RTM to HTM check.
+       * configure: Regenerate.
+
 2014-04-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * config/generic/asmcfi.h: Also check for

diff --git a/libitm/acinclude.m4 b/libitm/acinclude.m4
index 29458bed29130254824148111ac45aadb0a08c62..d1d351a58e802186d00431dcbdd816c7f856b844 100644 (file)
--- a/libitm/acinclude.m4
+++ b/libitm/acinclude.m4
@@ -121,17 +121,6 @@ i[[34567]]86 | x86_64)
     AC_DEFINE(HAVE_AS_RTM, 1, [Define to 1 if the assembler supports RTM.])
   fi
   ;;
-s390*)
-  AC_CACHE_CHECK([if the assembler supports HTM], libitm_cv_as_htm, [
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -march=zEC12"
-    AC_TRY_COMPILE([], [asm("tbegin 0,0; tend");],
-                  [libitm_cv_as_htm=yes], [libitm_cv_as_htm=no])
-    CFLAGS="$save_CFLAGS"])
-  if test x$libitm_cv_as_htm = xyes; then
-    AC_DEFINE(HAVE_AS_HTM, 1, [Define to 1 if the assembler supports HTM.])
-  fi
-  ;;
 esac])
 
 dnl Check if as supports HTM instructions.
@@ -146,6 +135,17 @@ powerpc*)
     AC_DEFINE(HAVE_AS_HTM, 1, [Define to 1 if the assembler supports HTM.])
   fi
   ;;
+s390*)
+  AC_CACHE_CHECK([if the assembler supports HTM], libitm_cv_as_htm, [
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS -march=zEC12"
+    AC_TRY_COMPILE([], [asm("tbegin 0,0; tend");],
+                   [libitm_cv_as_htm=yes], [libitm_cv_as_htm=no])
+    CFLAGS="$save_CFLAGS"])
+  if test x$libitm_cv_as_htm = xyes; then
+    AC_DEFINE(HAVE_AS_HTM, 1, [Define to 1 if the assembler supports HTM.])
+  fi
+  ;;
 esac])
 
 sinclude(../libtool.m4)

diff --git a/libitm/configure b/libitm/configure
index 216df6e757ca09dc672716b53ec2bcf1eba595df..031c19ce337c41b1427c5fcc2629ee3ddac82139 100644 (file)
--- a/libitm/configure
+++ b/libitm/configure
@@ -17368,22 +17368,23 @@ $as_echo "#define HAVE_AS_RTM 1" >>confdefs.h
 
   fi
   ;;
-s390*)
+esac
+
+case "${target_cpu}" in
+powerpc*)
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler supports HTM" >&5
 $as_echo_n "checking if the assembler supports HTM... " >&6; }
 if test "${libitm_cv_as_htm+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -march=zEC12"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
-asm("tbegin 0,0; tend");
+asm("tbegin. 0; tend. 0");
   ;
   return 0;
 }
@@ -17394,7 +17395,7 @@ else
   libitm_cv_as_htm=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS="$save_CFLAGS"
+
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libitm_cv_as_htm" >&5
 $as_echo "$libitm_cv_as_htm" >&6; }
@@ -17404,24 +17405,22 @@ $as_echo "#define HAVE_AS_HTM 1" >>confdefs.h
 
   fi
   ;;
-esac
-LIBITM_CHECK_AS_HTM
-
-case "${target_cpu}" in
-powerpc*)
+s390*)
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler supports HTM" >&5
 $as_echo_n "checking if the assembler supports HTM... " >&6; }
 if test "${libitm_cv_as_htm+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS -march=zEC12"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
-asm("tbegin. 0; tend. 0");
+asm("tbegin 0,0; tend");
   ;
   return 0;
 }
@@ -17432,7 +17431,7 @@ else
   libitm_cv_as_htm=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
+    CFLAGS="$save_CFLAGS"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libitm_cv_as_htm" >&5
 $as_echo "$libitm_cv_as_htm" >&6; }