Merge, from trunk:

  r15978 Use proper compiler flags on Solaris for fma4 test.
  r15980 Fix none/tests/amd64/Makefile.am typo s/AM_CFKAGS/AM_CFLAGS/

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

diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index aa9d65e0c9c4df1652a2e7fddb1a2098475eba0a..f0cd081d7a6bda09fd29e95086c617607e326fc9 100644 (file)
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -189,7 +189,10 @@ insn_fpu_SOURCES   = insn_fpu.def
 insn_fpu_LDADD         = -lm
 insn_pclmulqdq_SOURCES  = insn_pclmulqdq.def
 fxtract_LDADD          = -lm
-fma4_CFLAGS            = $(AM_CFKAGS) -std=c99
+fma4_CFLAGS            = $(AM_CFLAGS) -std=c99
+if VGCONF_OS_IS_SOLARIS
+fma4_CFLAGS            += -D__EXTENSIONS__
+endif
 fma4_LDADD             = -lm
 
 .def.c: $(srcdir)/gen_insn_test.pl