From 502693f50ec60c0e03ac9c245d7b5e0e06272679 Mon Sep 17 00:00:00 2001 From: WeiY Date: Wed, 24 Apr 2013 00:34:17 +0800 Subject: Clear the atomic conditional compilation. --- testsuites/sptests/configure.ac | 4 ---- testsuites/sptests/spatomic01/Makefile.am | 4 ---- testsuites/sptests/spatomic02/Makefile.am | 4 ---- testsuites/sptests/spatomic03/Makefile.am | 4 ---- testsuites/sptests/spatomic04/Makefile.am | 4 ---- testsuites/sptests/spatomic05/Makefile.am | 4 ---- testsuites/sptests/spatomic06/Makefile.am | 4 ---- testsuites/sptests/spatomic07/Makefile.am | 4 ---- 8 files changed, 32 deletions(-) (limited to 'testsuites') diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 2e489490f1..a43a1ad2c7 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -20,15 +20,11 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_CHECK_CPUOPTS([RTEMS_ATOMIC]) - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) # FIXME: We should get rid of this. It's a cludge. AC_CHECK_SIZEOF([time_t]) -AM_CONDITIONAL([ATOMIC],[test x"$rtems_cv_RTEMS_ATOMIC" = xyes]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile spfatal26/Makefile diff --git a/testsuites/sptests/spatomic01/Makefile.am b/testsuites/sptests/spatomic01/Makefile.am index 43613ec80c..73677ba65b 100644 --- a/testsuites/sptests/spatomic01/Makefile.am +++ b/testsuites/sptests/spatomic01/Makefile.am @@ -1,10 +1,8 @@ -if ATOMIC rtems_tests_PROGRAMS = spatomic01 spatomic01_SOURCES = init.c tasks.c system.h dist_rtems_tests_DATA = spatomic01.scn dist_rtems_tests_DATA += spatomic01.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am @@ -12,13 +10,11 @@ include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -I$(top_srcdir)/../support/include -if ATOMIC LINK_OBJS = $(spatomic01_OBJECTS) LINK_LIBS = $(spatomic01_LDLIBS) spatomic01$(EXEEXT): $(spatomic01_OBJECTS) $(spatomic01_DEPENDENCIES) @rm -f spatomic01$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spatomic02/Makefile.am b/testsuites/sptests/spatomic02/Makefile.am index cf3e655ae5..b04573174a 100644 --- a/testsuites/sptests/spatomic02/Makefile.am +++ b/testsuites/sptests/spatomic02/Makefile.am @@ -1,16 +1,13 @@ -if ATOMIC rtems_tests_PROGRAMS = spatomic02 spatomic02_SOURCES = init.c tasks.c system.h dist_rtems_tests_DATA = spatomic02.scn dist_rtems_tests_DATA += spatomic02.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -if ATOMIC AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(spatomic02_OBJECTS) @@ -19,6 +16,5 @@ LINK_LIBS = $(spatomic02_LDLIBS) spatomic02$(EXEEXT): $(spatomic02_OBJECTS) $(spatomic02_DEPENDENCIES) @rm -f spatomic01$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spatomic03/Makefile.am b/testsuites/sptests/spatomic03/Makefile.am index 15b3b472f4..981ad16022 100644 --- a/testsuites/sptests/spatomic03/Makefile.am +++ b/testsuites/sptests/spatomic03/Makefile.am @@ -1,16 +1,13 @@ -if ATOMIC rtems_tests_PROGRAMS = spatomic03 spatomic03_SOURCES = init.c tasks.c system.h dist_rtems_tests_DATA = spatomic03.scn dist_rtems_tests_DATA += spatomic03.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -if ATOMIC AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(spatomic03_OBJECTS) @@ -19,6 +16,5 @@ LINK_LIBS = $(spatomic03_LDLIBS) spatomic03$(EXEEXT): $(spatomic03_OBJECTS) $(spatomic03_DEPENDENCIES) @rm -f spatomic03$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spatomic04/Makefile.am b/testsuites/sptests/spatomic04/Makefile.am index d03e8b514c..12d84dd583 100644 --- a/testsuites/sptests/spatomic04/Makefile.am +++ b/testsuites/sptests/spatomic04/Makefile.am @@ -1,16 +1,13 @@ -if ATOMIC rtems_tests_PROGRAMS = spatomic04 spatomic04_SOURCES = init.c tasks.c system.h dist_rtems_tests_DATA = spatomic04.scn dist_rtems_tests_DATA += spatomic04.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -if ATOMIC AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(spatomic04_OBJECTS) @@ -19,6 +16,5 @@ LINK_LIBS = $(spatomic04_LDLIBS) spatomic04$(EXEEXT): $(spatomic04_OBJECTS) $(spatomic04_DEPENDENCIES) @rm -f spatomic04$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spatomic05/Makefile.am b/testsuites/sptests/spatomic05/Makefile.am index cf72b8e7a4..11c5a665cd 100644 --- a/testsuites/sptests/spatomic05/Makefile.am +++ b/testsuites/sptests/spatomic05/Makefile.am @@ -1,16 +1,13 @@ -if ATOMIC rtems_tests_PROGRAMS = spatomic05 spatomic05_SOURCES = init.c tasks.c system.h dist_rtems_tests_DATA = spatomic05.scn dist_rtems_tests_DATA += spatomic05.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -if ATOMIC AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(spatomic05_OBJECTS) @@ -19,6 +16,5 @@ LINK_LIBS = $(spatomic05_LDLIBS) spatomic05$(EXEEXT): $(spatomic05_OBJECTS) $(spatomic05_DEPENDENCIES) @rm -f spatomic05$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spatomic06/Makefile.am b/testsuites/sptests/spatomic06/Makefile.am index 82150f9fe4..8bd4ed336a 100644 --- a/testsuites/sptests/spatomic06/Makefile.am +++ b/testsuites/sptests/spatomic06/Makefile.am @@ -1,16 +1,13 @@ -if ATOMIC rtems_tests_PROGRAMS = spatomic06 spatomic06_SOURCES = init.c tasks.c system.h dist_rtems_tests_DATA = spatomic06.scn dist_rtems_tests_DATA += spatomic06.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -if ATOMIC AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(spatomic06_OBJECTS) @@ -19,6 +16,5 @@ LINK_LIBS = $(spatomic06_LDLIBS) spatomic06$(EXEEXT): $(spatomic06_OBJECTS) $(spatomic06_DEPENDENCIES) @rm -f spatomic06$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spatomic07/Makefile.am b/testsuites/sptests/spatomic07/Makefile.am index bd63c527e8..bde7791f67 100644 --- a/testsuites/sptests/spatomic07/Makefile.am +++ b/testsuites/sptests/spatomic07/Makefile.am @@ -1,16 +1,13 @@ -if ATOMIC rtems_tests_PROGRAMS = spatomic07 spatomic07_SOURCES = init.c tasks.c system.h dist_rtems_tests_DATA = spatomic07.scn dist_rtems_tests_DATA += spatomic07.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -if ATOMIC AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(spatomic07_OBJECTS) @@ -19,6 +16,5 @@ LINK_LIBS = $(spatomic07_LDLIBS) spatomic07$(EXEEXT): $(spatomic07_OBJECTS) $(spatomic07_DEPENDENCIES) @rm -f spatomic07$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am -- cgit v1.2.3