Make sure valgrind builds with clang 3.5.0

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14463

diff --git a/Makefile.vex.am b/Makefile.vex.am
index 41690e166003ca602bd0dcb9b9b06c1d3ea07d46..c9e81681180735c7e946130b322c1be873f7dd0b 100644 (file)
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -64,6 +64,12 @@ noinst_HEADERS = \
 BUILT_SOURCES = pub/libvex_guest_offsets.h
 CLEANFILES    = pub/libvex_guest_offsets.h
 
+if COMPILER_IS_CLANG
+CFLAGS_FOR_GENOFFSETS = $(CFLAGS) -no-integrated-as
+else
+CFLAGS_FOR_GENOFFSETS = $(CFLAGS)
+endif
+
 # This is very uggerly.  Need to sed out both "xyzzyN" and
 # "xyzzy$N" since gcc on different targets emits the constants
 # differently -- with a leading $ on x86/amd64 but none on ppc32/64.
@@ -80,7 +86,7 @@ pub/libvex_guest_offsets.h: auxprogs/genoffsets.c \
                            pub/libvex_guest_mips64.h
        rm -f auxprogs/genoffsets.s
        $(mkdir_p) auxprogs pub
-       $(CC) $(CFLAGS) \
+       $(CC) $(CFLAGS_FOR_GENOFFSETS) \
              $(LIBVEX_CFLAGS) \
              $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \
                                -O -S -o auxprogs/genoffsets.s \

diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index 6b37fe1dc4da8593fc865e96668e12034e51b0d6..0e72521fcc7b305bcbd0b96c4e40a1820183e782 100644 (file)
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -41,7 +41,6 @@ check_PROGRAMS = \
        fxsave-amd64 \
        insn-bsfl \
        insn-pmovmskb \
-       more_x87_fp \
        sh-mem-vec128 \
        sse_memory \
        xor-undef-amd64
@@ -51,6 +50,10 @@ endif
 if HAVE_ASM_CONSTRAINT_P
  check_PROGRAMS += insn-pcmpistri
 endif
+# clang 3.5.0 barfs about -mfancy-math-387
+if !COMPILER_IS_CLANG
+ check_PROGRAMS += more_x87_fp
+endif
 
 AM_CFLAGS    += @FLAG_M64@
 AM_CXXFLAGS  += @FLAG_M64@

diff --git a/memcheck/tests/amd64/more_x87_fp.vgtest b/memcheck/tests/amd64/more_x87_fp.vgtest
index 5e34ef86282a735f6f3abe60c984d61942d12d3c..e22b8132f461b6ddb8f1ea1fd57af339f59158a8 100644 (file)
--- a/memcheck/tests/amd64/more_x87_fp.vgtest
+++ b/memcheck/tests/amd64/more_x87_fp.vgtest
@@ -1,2 +1,3 @@
+prereq: test -e more_x87_fp
 prog: more_x87_fp
 vgopts: -q