DARWIN sync: Makefile.am layout, mostly.

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

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index 16493fc88886492e6dfe2f873c56caf50ed19752..cc0372b02a414be6429a191fd1ccde7d962beda9 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -8,10 +8,10 @@ CLEANFILES = $(addsuffix .c,$(INSN_TESTS))
 INSN_TESTS = insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext \
                insn_sse insn_sse2
 if BUILD_SSE3_TESTS
- INSN_TESTS += insn_sse3
+   INSN_TESTS += insn_sse3
 endif
 if BUILD_SSSE3_TESTS
- INSN_TESTS += insn_ssse3
+   INSN_TESTS += insn_ssse3
 endif
 
 # Explicitly include insn_sse3 even if ! BUILD_SSE3_TESTS, 
@@ -26,8 +26,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        bug132813-x86.stderr.exp bug132813-x86.stdout.exp bug132813-x86.vgtest \
        bug135421-x86.stderr.exp bug135421-x86.stdout.exp bug135421-x86.vgtest \
        bug137714-x86.stderr.exp bug137714-x86.stdout.exp bug137714-x86.vgtest \
-       bug152818-x86.vgtest bug152818-x86.stdout.exp \
-       bug152818-x86.stderr.exp \
+       bug152818-x86.stderr.exp bug152818-x86.stdout.exp bug152818-x86.vgtest \
        cmpxchg8b.stderr.exp cmpxchg8b.stdout.exp cmpxchg8b.vgtest \
        cpuid.stderr.exp cpuid.stdout.exp cpuid.vgtest \
        cse_fail.stderr.exp cse_fail.stdout.exp cse_fail.vgtest \
@@ -52,8 +51,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        sbbmisc.stderr.exp sbbmisc.stdout.exp sbbmisc.vgtest \
        smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
        ssse3_misaligned.stderr.exp ssse3_misaligned.stdout.exp \
-       ssse3_misaligned.vgtest \
-       ssse3_misaligned.c \
+       ssse3_misaligned.vgtest ssse3_misaligned.c \
        yield.stderr.exp yield.stdout.exp yield.disabled
 
 check_PROGRAMS = \
@@ -70,23 +68,23 @@ check_PROGRAMS = \
        cpuid \
        cse_fail \
        faultstatus \
-        fcmovnu \
-        fpu_lazy_eflags \
-        fxtract \
+       fcmovnu \
+       fpu_lazy_eflags \
+       fxtract \
        getseg \
-        incdec_alt \
-        $(INSN_TESTS) \
-        int \
+       incdec_alt \
+       $(INSN_TESTS) \
+       int \
        jcxz \
        lahf \
-        looper \
-        movx \
-        pushpopseg \
-        sbbmisc \
-        smc1 \
-        yield
+       looper \
+       movx \
+       pushpopseg \
+       sbbmisc \
+       smc1 \
+       yield
 if BUILD_SSSE3_TESTS
- check_PROGRAMS += ssse3_misaligned
+   check_PROGRAMS += ssse3_misaligned
 endif
 
 
@@ -95,9 +93,8 @@ AM_CXXFLAGS  += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CCASFLAGS += @FLAG_M32@
 
 
-# generic C ones
 cpuid_SOURCES          = cpuid_c.c cpuid_s.S
-# fpu_lazy_eflags must use these flags -- the bug only occurred with them
+# fpu_lazy_eflags must use these flags -- the bug only occurred with them.
 fpu_lazy_eflags_CFLAGS = $(AM_CFLAGS) -O2 -march=pentiumpro
 fxtract_LDADD          = -lm
 insn_basic_SOURCES     = insn_basic.def
@@ -116,6 +113,8 @@ insn_sse2_SOURCES   = insn_sse2.def
 insn_sse2_LDADD                = -lm
 insn_sse3_SOURCES      = insn_sse3.def
 insn_sse3_LDADD                = -lm
+insn_ssse3_SOURCES     = insn_ssse3.def
+insn_ssse3_LDADD       = -lm
 yield_LDADD            = -lpthread
 
 .def.c: $(srcdir)/gen_insn_test.pl