This is x86 specific; re-home accordingly.

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

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 087bad381c417e2eb1a1fcc86a4bda273df13794..fc5ac53d7642cf90b0e2aaed322ec324ac77f614 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -96,8 +96,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        threadederrno.stderr.exp threadederrno.stdout.exp \
        threadederrno.vgtest \
        tls.stderr.exp tls.stdout.exp  \
-       vgprintf.stderr.exp vgprintf.stdout.exp vgprintf.vgtest \
-       yield.stderr.exp yield.stdout.exp yield.vgtest
+       vgprintf.stderr.exp vgprintf.stdout.exp vgprintf.vgtest
 
 check_PROGRAMS = \
        ansi args as_mmap as_shm \
@@ -117,7 +116,7 @@ check_PROGRAMS = \
        shortpush shorts stackgrowth sigstackgrowth susphello \
        syscall-restart1 syscall-restart2 system \
        thread-exits threaded-fork threadederrno \
-       tls tls.so tls2.so yield vgprintf \
+       tls tls.so tls2.so vgprintf \
        coolo_sigaction gxx304
 
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g
@@ -158,8 +157,6 @@ tls_so_LDFLAGS              = -Wl,-rpath,$(top_builddir)/none/tests -shared -fPIC
 tls_so_CFLAGS          = -fPIC
 tls2_so_SOURCES                = tls2_so.c
 tls2_so_LDFLAGS                = -shared
-yield_CFLAGS           = $(AM_CFLAGS) -D__$(VG_ARCH)__
-yield_LDADD            = -lpthread
 
 # C++ tests
 coolo_sigaction_SOURCES        = coolo_sigaction.cpp

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index 209607da04320abc0ae522188810c4b2a559bd91..5c5a52c930930be15ba8de80ca34f0b4ea2b88a5 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -18,12 +18,13 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        pushpopseg.stderr.exp pushpopseg.stdout.exp pushpopseg.vgtest \
        seg_override.stderr.exp seg_override.stdout.exp seg_override.vgtest \
        sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest \
-       smc1.stderr.exp smc1.stdout.exp smc1.vgtest
+       smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
+       yield.stderr.exp yield.stdout.exp yield.vgtest
 
 check_PROGRAMS = \
        badseg bt_everything bt_literal cpuid fpu_lazy_eflags \
        getseg $(INSN_TESTS) \
-       int pushpopseg seg_override sigcontext smc1
+       int pushpopseg seg_override sigcontext smc1 yield
 
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow \
                -g -I$(top_srcdir)/include \
@@ -49,6 +50,8 @@ insn_sse_SOURCES      = insn_sse.def
 insn_sse_LDADD         = -lm
 insn_sse2_SOURCES      = insn_sse2.def
 insn_sse2_LDADD                = -lm
+yield_CFLAGS           = $(AM_CFLAGS) -D__$(VG_ARCH)__
+yield_LDADD            = -lpthread
 
 .def.c: $(srcdir)/gen_insn_test.pl
        $(PERL) $(srcdir)/gen_insn_test.pl < $< > $@

diff --git a/none/tests/yield.c b/none/tests/x86/yield.c
similarity index 100%
rename from none/tests/yield.c
rename to none/tests/x86/yield.c

diff --git a/none/tests/yield.stderr.exp b/none/tests/x86/yield.stderr.exp
similarity index 100%
rename from none/tests/yield.stderr.exp
rename to none/tests/x86/yield.stderr.exp

diff --git a/none/tests/yield.stdout.exp b/none/tests/x86/yield.stdout.exp
similarity index 100%
rename from none/tests/yield.stdout.exp
rename to none/tests/x86/yield.stdout.exp

diff --git a/none/tests/yield.vgtest b/none/tests/x86/yield.vgtest
similarity index 100%
rename from none/tests/yield.vgtest
rename to none/tests/x86/yield.vgtest