diff options
| author | WeiY <wei.a.yang@gmail.com> | 2013-04-24 00:34:17 +0800 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2013-05-01 10:28:48 -0400 |
| commit | 502693f50ec60c0e03ac9c245d7b5e0e06272679 (patch) | |
| tree | d6e1c102f0bb8c946fdb4403b559c768e5ebf25b /cpukit | |
| parent | Using the generic atomic ops to implement UP mode atomic for all architecture... (diff) | |
| download | rtems-502693f50ec60c0e03ac9c245d7b5e0e06272679.tar.bz2 | |
Clear the atomic conditional compilation.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/configure.ac | 7 | ||||
| -rw-r--r-- | cpukit/rtems/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/rtems/preinstall.am | 3 | ||||
| -rw-r--r-- | cpukit/score/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/score/preinstall.am | 3 |
5 files changed, 2 insertions, 15 deletions
diff --git a/cpukit/configure.ac b/cpukit/configure.ac index f897eced5c..d82d30f039 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -149,7 +149,6 @@ RTEMS_CHECK_MULTIPROCESSING RTEMS_CHECK_POSIX_API RTEMS_CHECK_NETWORKING RTEMS_CHECK_SMP -RTEMS_CHECK_ATOMIC rtems_major=`echo _RTEMS_VERSION | sed "s/\..*//"` rtems_minor=`echo _RTEMS_VERSION | sed "s/[[0-9]][[0-9]]*\.//;s/\..*//"` @@ -187,11 +186,6 @@ RTEMS_CPUOPT([RTEMS_NETWORKING], [1], [if networking is enabled]) -RTEMS_CPUOPT([RTEMS_ATOMIC], - [test x"$rtems_cv_ATOMIC" = xyes], - [1], - [if cpu supports atomic operations]) - RTEMS_CPUOPT([RTEMS_VERSION], [true], ["]_RTEMS_VERSION["], @@ -310,7 +304,6 @@ AM_CONDITIONAL(HAS_SMP,[test "$RTEMS_HAS_SMP" = "yes"]) AM_CONDITIONAL(HAS_PTHREADS,test x"$rtems_cv_HAS_POSIX_API" = x"yes") AM_CONDITIONAL(LIBNETWORKING,test x"$rtems_cv_HAS_NETWORKING" = x"yes") -AM_CONDITIONAL([ATOMIC],[test x"$rtems_cv_ATOMIC" = x"yes"]) AM_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"]) AM_CONDITIONAL([LIBSERDBG],[test x"$rtems_cv_cc_attribute_weak" = x"yes"]) diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 607a98ba8e..768d451588 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -39,9 +39,7 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/support.h include_rtems_rtems_HEADERS += include/rtems/rtems/tasks.h include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h include_rtems_rtems_HEADERS += include/rtems/rtems/types.h -if ATOMIC include_rtems_rtems_HEADERS += include/rtems/rtems/atomic.h -endif include_rtems_rtems_HEADERS += mainpage.h if HAS_MP diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am index d7d9a63431..f64600fe10 100644 --- a/cpukit/rtems/preinstall.am +++ b/cpukit/rtems/preinstall.am @@ -127,11 +127,10 @@ $(PROJECT_INCLUDE)/rtems/rtems/types.h: include/rtems/rtems/types.h $(PROJECT_IN $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/types.h -if ATOMIC $(PROJECT_INCLUDE)/rtems/rtems/atomic.h: include/rtems/rtems/atomic.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/atomic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/atomic.h -endif + $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h: mainpage.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 396cccfe6d..604ab34669 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -57,11 +57,9 @@ include_rtems_score_HEADERS += include/rtems/score/watchdog.h include_rtems_score_HEADERS += include/rtems/score/wkspace.h include_rtems_score_HEADERS += include/rtems/score/cpuopts.h include_rtems_score_HEADERS += include/rtems/score/basedefs.h -if ATOMIC include_rtems_score_HEADERS += include/rtems/score/atomic.h include_rtems_score_HEADERS += include/rtems/score/genericcpuatomic.h include_rtems_score_HEADERS += include/rtems/score/genericatomicops.h -endif if HAS_SMP include_rtems_score_HEADERS += include/rtems/score/smplock.h include_rtems_score_HEADERS += include/rtems/score/smp.h diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index 7054c3d29c..9499f4d0ea 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -211,7 +211,6 @@ $(PROJECT_INCLUDE)/rtems/score/basedefs.h: include/rtems/score/basedefs.h $(PROJ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/basedefs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h -if ATOMIC $(PROJECT_INCLUDE)/rtems/score/atomic.h: include/rtems/score/atomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/atomic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/atomic.h @@ -223,7 +222,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/genericcpuatomic.h $(PROJECT_INCLUDE)/rtems/score/genericatomicops.h: include/rtems/score/genericatomicops.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/genericatomicops.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/genericatomicops.h -endif + if HAS_SMP $(PROJECT_INCLUDE)/rtems/score/smplock.h: include/rtems/score/smplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplock.h |