|
From: <sv...@va...> - 2016-10-17 17:02:41
|
Author: sewardj
Date: Mon Oct 17 18:02:32 2016
New Revision: 16054
Log:
Merge, from trunk:
16030 fix building the dfp testcase
Modified:
branches/VALGRIND_3_12_BRANCH/ (props changed)
branches/VALGRIND_3_12_BRANCH/configure.ac
Modified: branches/VALGRIND_3_12_BRANCH/configure.ac
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/configure.ac (original)
+++ branches/VALGRIND_3_12_BRANCH/configure.ac Mon Oct 17 18:02:32 2016
@@ -1428,8 +1428,12 @@
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 @@
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_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)
|