|
From: <sv...@va...> - 2014-09-05 14:09:04
|
Author: florian
Date: Fri Sep 5 14:08:51 2014
New Revision: 14463
Log:
Make sure valgrind builds with clang 3.5.0
Modified:
trunk/Makefile.vex.am
trunk/memcheck/tests/amd64/Makefile.am
trunk/memcheck/tests/amd64/more_x87_fp.vgtest
Modified: trunk/Makefile.vex.am
==============================================================================
--- trunk/Makefile.vex.am (original)
+++ trunk/Makefile.vex.am Fri Sep 5 14:08:51 2014
@@ -64,6 +64,12 @@
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_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 \
Modified: trunk/memcheck/tests/amd64/Makefile.am
==============================================================================
--- trunk/memcheck/tests/amd64/Makefile.am (original)
+++ trunk/memcheck/tests/amd64/Makefile.am Fri Sep 5 14:08:51 2014
@@ -41,7 +41,6 @@
fxsave-amd64 \
insn-bsfl \
insn-pmovmskb \
- more_x87_fp \
sh-mem-vec128 \
sse_memory \
xor-undef-amd64
@@ -51,6 +50,10 @@
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@
Modified: trunk/memcheck/tests/amd64/more_x87_fp.vgtest
==============================================================================
--- trunk/memcheck/tests/amd64/more_x87_fp.vgtest (original)
+++ trunk/memcheck/tests/amd64/more_x87_fp.vgtest Fri Sep 5 14:08:51 2014
@@ -1,2 +1,3 @@
+prereq: test -e more_x87_fp
prog: more_x87_fp
vgopts: -q
|