Merge, from trunk:

  16030  fix building the dfp testcase

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_12_BRANCH@16054

diff --git a/configure.ac b/configure.ac
index 7960140d5fd5f2b744f3055768517a062ba6e42a..ac70fe007b1c0ebb2dc0c138a4c570c0e29fdb40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1428,8 +1428,12 @@ AM_CONDITIONAL([HAS_VSX], [test x$ac_compiler_supports_vsx_flag = xyes \
 AC_MSG_CHECKING([that assembler knows DFP])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 ]], [[
+  #ifdef __s390__
+  __asm__ __volatile__("adtr 1, 2, 3")
+  #else
   __asm__ __volatile__("dadd 1, 2, 3");
   __asm__ __volatile__("dcffix 1, 2");
+  #endif
 ]])], [
 ac_asm_have_dfp=yes
 AC_MSG_RESULT([yes])
@@ -1442,8 +1446,12 @@ safe_CFLAGS=$CFLAGS
 CFLAGS="-mhard-dfp -Werror"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 ]], [[
+  #ifdef __s390__
+  __asm__ __volatile__("adtr 1, 2, 3")
+  #else
   __asm__ __volatile__("dadd 1, 2, 3");
   __asm__ __volatile__("dcffix 1, 2");
+  #endif
 ]])], [
 ac_compiler_have_dfp=yes
 AC_MSG_RESULT([yes])
@@ -1468,7 +1476,7 @@ ac_compiler_have_dfp_type=no
 AC_MSG_RESULT([no])
 ])
 AM_CONDITIONAL(BUILD_DFP_TESTS, test x$ac_compiler_have_dfp_type = xyes \
-                                  -a xHWCAP_$HAS_DFP = xyes )
+                                  -a x$HWCAP_HAS_DFP = xyes )
 
 
 # HTM (Hardware Transactional Memory)