|
From: <sv...@va...> - 2007-03-22 12:13:15
|
Author: sewardj Date: 2007-03-22 12:13:13 +0000 (Thu, 22 Mar 2007) New Revision: 6657 Log: Don't build SSE3 tests if the configure test determined that the assembler does not know about SSE3 instructions. Modified: trunk/configure.in trunk/none/tests/amd64/Makefile.am trunk/none/tests/x86/Makefile.am Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2007-03-22 03:36:55 UTC (rev 6656) +++ trunk/configure.in 2007-03-22 12:13:13 UTC (rev 6657) @@ -744,6 +744,8 @@ # does the x86/amd64 assembler understand SSE3 instructions? +# Note, this doesn't generate a C-level symbol. It generates a +# automake-level symbol (BUILD_SSE3_TESTS), used in test Makefile.am's AC_MSG_CHECKING([if x86/amd64 assembler speaks SSE3]) AC_TRY_COMPILE(, [ @@ -758,11 +760,10 @@ ac_have_as_sse3=no AC_MSG_RESULT([no]) ]) -if test x$ac_have_as_sse3 = xyes ; then - AC_DEFINE(HAVE_AS_SSE3, 1, [Define to 1 if x86/amd64 as supports SSE3.]) -fi +AM_CONDITIONAL(BUILD_SSE3_TESTS, test x$ac_have_as_sse3 = xyes) + # Check for TLS support in the compiler and linker AC_CACHE_CHECK([for TLS support], vg_cv_tls, [AC_ARG_ENABLE(tls, [ --enable-tls platform supports TLS], Modified: trunk/none/tests/amd64/Makefile.am =================================================================== --- trunk/none/tests/amd64/Makefile.am 2007-03-22 03:36:55 UTC (rev 6656) +++ trunk/none/tests/amd64/Makefile.am 2007-03-22 12:13:13 UTC (rev 6657) @@ -2,8 +2,15 @@ noinst_SCRIPTS = filter_cpuid filter_stderr filter_int gen_insn_test.pl CLEANFILES = $(addsuffix .c,$(INSN_TESTS)) -INSN_TESTS = insn_basic insn_mmx insn_sse insn_sse2 insn_sse3 insn_fpu +INSN_TESTS = insn_basic insn_mmx insn_sse insn_sse2 insn_fpu +if BUILD_SSE3_TESTS + INSN_TESTS += insn_sse3 +endif + +# Explicitly include insn_sse3 even if ! BUILD_SSE3_TESTS, +# to avoid packaging screwups if 'make dist' is run on a machine +# which failed the BUILD_SSE3_TESTS test in configure.in. EXTRA_DIST = $(noinst_SCRIPTS) \ bug127521-64.vgtest bug127521-64.stdout.exp bug127521-64.stderr.exp \ bug132813-amd64.vgtest bug132813-amd64.stdout.exp \ @@ -16,6 +23,7 @@ $(addsuffix .stderr.exp,$(INSN_TESTS)) \ $(addsuffix .stdout.exp,$(INSN_TESTS)) \ $(addsuffix .vgtest,$(INSN_TESTS)) \ + insn_sse3.stdout.exp insn_sse3.stderr.exp insn_sse3.vgtest \ jrcxz.stderr.exp jrcxz.stdout.exp jrcxz.vgtest \ looper.stderr.exp looper.stdout.exp looper.vgtest \ nibz_bennee_mmap.stderr.exp nibz_bennee_mmap.stdout.exp \ Modified: trunk/none/tests/x86/Makefile.am =================================================================== --- trunk/none/tests/x86/Makefile.am 2007-03-22 03:36:55 UTC (rev 6656) +++ trunk/none/tests/x86/Makefile.am 2007-03-22 12:13:13 UTC (rev 6657) @@ -1,9 +1,16 @@ noinst_SCRIPTS = filter_cpuid filter_stderr gen_insn_test.pl CLEANFILES = $(addsuffix .c,$(INSN_TESTS)) + INSN_TESTS = insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext \ - insn_sse insn_sse2 insn_sse3 + insn_sse insn_sse2 +if BUILD_SSE3_TESTS + INSN_TESTS += insn_sse3 +endif +# Explicitly include insn_sse3 even if ! BUILD_SSE3_TESTS, +# to avoid packaging screwups if 'make dist' is run on a machine +# which failed the BUILD_SSE3_TESTS test in configure.in. EXTRA_DIST = $(noinst_SCRIPTS) \ badseg.stderr.exp badseg.stdout.exp badseg.vgtest \ bt_everything.stderr.exp bt_everything.stdout.exp bt_everything.vgtest \ @@ -27,6 +34,7 @@ $(addsuffix .stderr.exp,$(INSN_TESTS)) \ $(addsuffix .stdout.exp,$(INSN_TESTS)) \ $(addsuffix .vgtest,$(INSN_TESTS)) \ + insn_sse3.stdout.exp insn_sse3.stderr.exp insn_sse3.vgtest \ jcxz.stdout.exp jcxz.stderr.exp jcxz.vgtest \ lahf.stdout.exp lahf.stderr.exp lahf.vgtest \ looper.stderr.exp looper.stdout.exp looper.vgtest \ |