|
From: <sv...@va...> - 2009-02-23 01:18:17
|
Author: njn Date: 2009-02-23 01:18:06 +0000 (Mon, 23 Feb 2009) New Revision: 9227 Log: Some more test/build cleanups missed in prior commits. Modified: trunk/cachegrind/tests/x86/Makefile.am trunk/exp-ptrcheck/tests/x86/Makefile.am trunk/none/tests/x86/Makefile.am Modified: trunk/cachegrind/tests/x86/Makefile.am =================================================================== --- trunk/cachegrind/tests/x86/Makefile.am 2009-02-23 01:03:06 UTC (rev 9226) +++ trunk/cachegrind/tests/x86/Makefile.am 2009-02-23 01:18:06 UTC (rev 9227) @@ -1,3 +1,6 @@ + +include $(top_srcdir)/Makefile.tool-tests.am + noinst_SCRIPTS = filter_stderr EXTRA_DIST = $(noinst_SCRIPTS) \ @@ -6,7 +9,9 @@ check_PROGRAMS = \ fpu-28-108 -AM_CFLAGS = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g + +AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) AM_CCASFLAGS = @FLAG_M32@ fpu_28_108_SOURCES = fpu-28-108.S Modified: trunk/exp-ptrcheck/tests/x86/Makefile.am =================================================================== --- trunk/exp-ptrcheck/tests/x86/Makefile.am 2009-02-23 01:03:06 UTC (rev 9226) +++ trunk/exp-ptrcheck/tests/x86/Makefile.am 2009-02-23 01:18:06 UTC (rev 9227) @@ -1,4 +1,6 @@ +include $(top_srcdir)/Makefile.tool-tests.am + noinst_SCRIPTS = filter_stderr check_PROGRAMS = asm lea @@ -7,10 +9,9 @@ asm.vgtest-disabled asm.stderr.exp \ lea.vgtest-disabled lea.stderr.exp -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g \ - $(FLAG_MMMX) $(FLAG_MSSE) -AM_CXXFLAGS = $(AM_CFLAGS) + +AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) AM_CCASFLAGS = @FLAG_M32@ asm_SOURCES = asm.S Modified: trunk/none/tests/x86/Makefile.am =================================================================== --- trunk/none/tests/x86/Makefile.am 2009-02-23 01:03:06 UTC (rev 9226) +++ trunk/none/tests/x86/Makefile.am 2009-02-23 01:18:06 UTC (rev 9227) @@ -28,8 +28,8 @@ bug137714-x86.stderr.exp bug137714-x86.stdout.exp bug137714-x86.vgtest \ bug152818-x86.vgtest bug152818-x86.stdout.exp \ bug152818-x86.stderr.exp \ + cmpxchg8b.stderr.exp cmpxchg8b.stdout.exp cmpxchg8b.vgtest \ cpuid.stderr.exp cpuid.stdout.exp cpuid.vgtest \ - cmpxchg8b.stderr.exp cmpxchg8b.stdout.exp cmpxchg8b.vgtest \ cse_fail.stderr.exp cse_fail.stdout.exp cse_fail.vgtest \ faultstatus.disabled faultstatus.stderr.exp \ fcmovnu.vgtest fcmovnu.stderr.exp fcmovnu.stdout.exp \ |