Fix various bits of regtest breakage on amd64-linux caused by the MACOSX106

merge.

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

diff --git a/memcheck/tests/amd64-linux/Makefile.am b/memcheck/tests/amd64-linux/Makefile.am
index 90e89f51963208c9876da0e9a0c4e57ea7bb3c63..5a25be22472529df8fc7e95e9fc103e3bf5ef224 100644 (file)
--- a/memcheck/tests/amd64-linux/Makefile.am
+++ b/memcheck/tests/amd64-linux/Makefile.am
@@ -2,18 +2,20 @@
 include $(top_srcdir)/Makefile.tool-tests.am
 
 dist_noinst_SCRIPTS = \
-       filter_stderr
+       filter_stderr filter_defcfaexpr
 
 EXTRA_DIST = \
-       defcaexpr.vgtest defcaexpr.stderr.exp \
+       defcfaexpr.vgtest defcfaexpr.stderr.exp \
        int3-x86.vgtest int3-x86.stderr.exp int3-x86.stdout.exp
 
 check_PROGRAMS = \
-       defcaexpr \
+       defcfaexpr \
        int3-amd64
 
 
-AM_CFLAGS    += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CXXFLAGS  += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CCASFLAGS += @FLAG_M32@
+AM_CFLAGS    += @FLAG_M64@
+AM_CXXFLAGS  += @FLAG_M64@
+AM_CCASFLAGS += @FLAG_M64@
+
+defcfaexpr_SOURCES     = defcfaexpr.S
 

diff --git a/memcheck/tests/amd64/filter_defcfaexpr b/memcheck/tests/amd64-linux/filter_defcfaexpr
similarity index 91%
rename from memcheck/tests/amd64/filter_defcfaexpr
rename to memcheck/tests/amd64-linux/filter_defcfaexpr
index 7fa1afee71996408ac2a5aedc8cb4a676ae133c6..5f4af5835930284c6f88c7d3bb2c4335e9fc426e 100755 (executable)
--- a/memcheck/tests/amd64/filter_defcfaexpr
+++ b/memcheck/tests/amd64-linux/filter_defcfaexpr
@@ -23,6 +23,6 @@
 # stack given the unusual CFAs describing it.
 
 
-sed "s/\/.*\/tests\/amd64\/defcfaexpr/bogus.S:0/" | \
+sed "s/\/.*\/tests\/amd64-linux\/defcfaexpr/bogus.S:0/" | \
       sed "s/(in /(/" | \
       ./filter_stderr

diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index 147bb9991c8d77e0a94e728c36194c6ec02f086d..16b958c184002284d2c5a43af44d8ad211721c4d 100644 (file)
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -12,7 +12,6 @@ EXTRA_DIST = \
        bt_everything.stderr.exp bt_everything.stdout.exp \
                bt_everything.vgtest \
        bug132146.vgtest bug132146.stderr.exp bug132146.stdout.exp \
-       defcfaexpr.vgtest defcfaexpr.stderr.exp filter_defcfaexpr \
        fxsave-amd64.vgtest fxsave-amd64.stdout.exp fxsave-amd64.stderr.exp \
        int3-amd64.vgtest int3-amd64.stdout.exp int3-amd64.stderr.exp \
        more_x87_fp.stderr.exp more_x87_fp.stdout.exp more_x87_fp.vgtest \
@@ -28,13 +27,6 @@ check_PROGRAMS = \
        sse_memory \
        xor-undef-amd64
 
-# DDD: these should be moved into amd64-linux/.
-if ! VGCONF_OS_IS_DARWIN
-   check_PROGRAMS += \
-       defcfaexpr \
-       int3-amd64
-endif
-
 AM_CFLAGS    += @FLAG_M64@
 AM_CXXFLAGS  += @FLAG_M64@
 AM_CCASFLAGS += @FLAG_M64@
@@ -43,4 +35,3 @@ more_x87_fp_CFLAGS    = $(AM_CFLAGS) -O -ffast-math -mfpmath=387 \
                                -mfancy-math-387
 more_x87_fp_LDADD      = -lm
 
-defcfaexpr_SOURCES     = defcfaexpr.S