Changeset 502693f5 in rtems


Ignore:
Timestamp:
Apr 23, 2013, 4:34:17 PM (6 years ago)
Author:
WeiY <wei.a.yang@…>
Branches:
4.11, master
Children:
5aa4ed9
Parents:
9b605b28
git-author:
WeiY <wei.a.yang@…> (04/23/13 16:34:17)
git-committer:
Gedare Bloom <gedare@…> (05/01/13 14:28:48)
Message:

Clear the atomic conditional compilation.

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • cpukit/configure.ac

    r9b605b28 r502693f5  
    150150RTEMS_CHECK_NETWORKING
    151151RTEMS_CHECK_SMP
    152 RTEMS_CHECK_ATOMIC
    153152
    154153rtems_major=`echo _RTEMS_VERSION | sed "s/\..*//"`
     
    187186  [1],
    188187  [if networking is enabled])
    189 
    190 RTEMS_CPUOPT([RTEMS_ATOMIC],
    191   [test x"$rtems_cv_ATOMIC" = xyes],
    192   [1],
    193   [if cpu supports atomic operations])
    194188
    195189RTEMS_CPUOPT([RTEMS_VERSION],
     
    311305AM_CONDITIONAL(HAS_PTHREADS,test x"$rtems_cv_HAS_POSIX_API" = x"yes")
    312306AM_CONDITIONAL(LIBNETWORKING,test x"$rtems_cv_HAS_NETWORKING" = x"yes")
    313 AM_CONDITIONAL([ATOMIC],[test x"$rtems_cv_ATOMIC" = x"yes"])
    314307
    315308AM_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"])
  • cpukit/rtems/Makefile.am

    r9b605b28 r502693f5  
    4040include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h
    4141include_rtems_rtems_HEADERS += include/rtems/rtems/types.h
    42 if ATOMIC
    4342include_rtems_rtems_HEADERS += include/rtems/rtems/atomic.h
    44 endif
    4543include_rtems_rtems_HEADERS += mainpage.h
    4644
  • cpukit/rtems/preinstall.am

    r9b605b28 r502693f5  
    128128PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/types.h
    129129
    130 if ATOMIC
    131130$(PROJECT_INCLUDE)/rtems/rtems/atomic.h: include/rtems/rtems/atomic.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    132131        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/atomic.h
    133132PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/atomic.h
    134 endif
     133
    135134$(PROJECT_INCLUDE)/rtems/rtems/mainpage.h: mainpage.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    136135        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h
  • cpukit/score/Makefile.am

    r9b605b28 r502693f5  
    5858include_rtems_score_HEADERS += include/rtems/score/cpuopts.h
    5959include_rtems_score_HEADERS += include/rtems/score/basedefs.h
    60 if ATOMIC
    6160include_rtems_score_HEADERS += include/rtems/score/atomic.h
    6261include_rtems_score_HEADERS += include/rtems/score/genericcpuatomic.h
    6362include_rtems_score_HEADERS += include/rtems/score/genericatomicops.h
    64 endif
    6563if HAS_SMP
    6664include_rtems_score_HEADERS += include/rtems/score/smplock.h
  • cpukit/score/preinstall.am

    r9b605b28 r502693f5  
    212212PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h
    213213
    214 if ATOMIC
    215214$(PROJECT_INCLUDE)/rtems/score/atomic.h: include/rtems/score/atomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    216215        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/atomic.h
     
    224223        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/genericatomicops.h
    225224PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/genericatomicops.h
    226 endif
     225
    227226if HAS_SMP
    228227$(PROJECT_INCLUDE)/rtems/score/smplock.h: include/rtems/score/smplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
  • testsuites/sptests/configure.ac

    r9b605b28 r502693f5  
    2121RTEMS_CANONICALIZE_TOOLS
    2222
    23 RTEMS_CHECK_CPUOPTS([RTEMS_ATOMIC])
    24 
    2523RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2624
    2725# FIXME: We should get rid of this. It's a cludge.
    2826AC_CHECK_SIZEOF([time_t])
    29 
    30 AM_CONDITIONAL([ATOMIC],[test x"$rtems_cv_RTEMS_ATOMIC" = xyes])
    3127
    3228# Explicitly list all Makefiles here
  • testsuites/sptests/spatomic01/Makefile.am

    r9b605b28 r502693f5  
    1 if ATOMIC
    21rtems_tests_PROGRAMS = spatomic01
    32spatomic01_SOURCES = init.c tasks.c system.h
     
    54dist_rtems_tests_DATA = spatomic01.scn
    65dist_rtems_tests_DATA += spatomic01.doc
    7 endif
    86
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    1311AM_CPPFLAGS += -I$(top_srcdir)/../support/include
    1412
    15 if ATOMIC
    1613LINK_OBJS = $(spatomic01_OBJECTS)
    1714LINK_LIBS = $(spatomic01_LDLIBS)
     
    2017        @rm -f spatomic01$(EXEEXT)
    2118        $(make-exe)
    22 endif
    2319
    2420include $(top_srcdir)/../automake/local.am
  • testsuites/sptests/spatomic02/Makefile.am

    r9b605b28 r502693f5  
    1 if ATOMIC
    21rtems_tests_PROGRAMS = spatomic02
    32spatomic02_SOURCES = init.c tasks.c system.h
     
    54dist_rtems_tests_DATA = spatomic02.scn
    65dist_rtems_tests_DATA += spatomic02.doc
    7 endif
    86
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    119include $(top_srcdir)/../automake/leaf.am
    1210
    13 if ATOMIC
    1411AM_CPPFLAGS += -I$(top_srcdir)/../support/include
    1512
     
    2017        @rm -f spatomic01$(EXEEXT)
    2118        $(make-exe)
    22 endif
    2319
    2420include $(top_srcdir)/../automake/local.am
  • testsuites/sptests/spatomic03/Makefile.am

    r9b605b28 r502693f5  
    1 if ATOMIC
    21rtems_tests_PROGRAMS = spatomic03
    32spatomic03_SOURCES = init.c tasks.c system.h
     
    54dist_rtems_tests_DATA = spatomic03.scn
    65dist_rtems_tests_DATA += spatomic03.doc
    7 endif
    86
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    119include $(top_srcdir)/../automake/leaf.am
    1210
    13 if ATOMIC
    1411AM_CPPFLAGS += -I$(top_srcdir)/../support/include
    1512
     
    2017        @rm -f spatomic03$(EXEEXT)
    2118        $(make-exe)
    22 endif
    2319
    2420include $(top_srcdir)/../automake/local.am
  • testsuites/sptests/spatomic04/Makefile.am

    r9b605b28 r502693f5  
    1 if ATOMIC
    21rtems_tests_PROGRAMS = spatomic04
    32spatomic04_SOURCES = init.c tasks.c system.h
     
    54dist_rtems_tests_DATA = spatomic04.scn
    65dist_rtems_tests_DATA += spatomic04.doc
    7 endif
    86
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    119include $(top_srcdir)/../automake/leaf.am
    1210
    13 if ATOMIC
    1411AM_CPPFLAGS += -I$(top_srcdir)/../support/include
    1512
     
    2017        @rm -f spatomic04$(EXEEXT)
    2118        $(make-exe)
    22 endif
    2319
    2420include $(top_srcdir)/../automake/local.am
  • testsuites/sptests/spatomic05/Makefile.am

    r9b605b28 r502693f5  
    1 if ATOMIC
    21rtems_tests_PROGRAMS = spatomic05
    32spatomic05_SOURCES = init.c tasks.c system.h
     
    54dist_rtems_tests_DATA = spatomic05.scn
    65dist_rtems_tests_DATA += spatomic05.doc
    7 endif
    86
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    119include $(top_srcdir)/../automake/leaf.am
    1210
    13 if ATOMIC
    1411AM_CPPFLAGS += -I$(top_srcdir)/../support/include
    1512
     
    2017        @rm -f spatomic05$(EXEEXT)
    2118        $(make-exe)
    22 endif
    2319
    2420include $(top_srcdir)/../automake/local.am
  • testsuites/sptests/spatomic06/Makefile.am

    r9b605b28 r502693f5  
    1 if ATOMIC
    21rtems_tests_PROGRAMS = spatomic06
    32spatomic06_SOURCES = init.c tasks.c system.h
     
    54dist_rtems_tests_DATA = spatomic06.scn
    65dist_rtems_tests_DATA += spatomic06.doc
    7 endif
    86
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    119include $(top_srcdir)/../automake/leaf.am
    1210
    13 if ATOMIC
    1411AM_CPPFLAGS += -I$(top_srcdir)/../support/include
    1512
     
    2017        @rm -f spatomic06$(EXEEXT)
    2118        $(make-exe)
    22 endif
    2319
    2420include $(top_srcdir)/../automake/local.am
  • testsuites/sptests/spatomic07/Makefile.am

    r9b605b28 r502693f5  
    1 if ATOMIC
    21rtems_tests_PROGRAMS = spatomic07
    32spatomic07_SOURCES = init.c tasks.c system.h
     
    54dist_rtems_tests_DATA = spatomic07.scn
    65dist_rtems_tests_DATA += spatomic07.doc
    7 endif
    86
    97include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    119include $(top_srcdir)/../automake/leaf.am
    1210
    13 if ATOMIC
    1411AM_CPPFLAGS += -I$(top_srcdir)/../support/include
    1512
     
    2017        @rm -f spatomic07$(EXEEXT)
    2118        $(make-exe)
    22 endif
    2319
    2420include $(top_srcdir)/../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.