Changeset 8a9568d in rtems


Ignore:
Timestamp:
Feb 14, 2014, 10:18:13 AM (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
7d066fc
Parents:
dcd97c7
git-author:
Sebastian Huber <sebastian.huber@…> (02/14/14 10:18:13)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/17/14 07:46:38)
Message:

Require presence of <stdatomic.h> for SMP support

Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • cpukit/configure.ac

    rdcd97c7 r8a9568d  
    160160RTEMS_CHECK_NETWORKING
    161161RTEMS_CHECK_SMP
    162 RTEMS_CHECK_ATOMIC
     162if test "${RTEMS_HAS_SMP}" = "yes"; then
     163  AC_CHECK_HEADERS([stdatomic.h],[],[AC_MSG_ERROR([<stdatomic.h> is required for SMP support])])
     164fi
    163165
    164166rtems_major=`echo _RTEMS_VERSION | sed "s/\..*//"`
     
    202204  [1],
    203205  [if networking is enabled])
    204 
    205 RTEMS_CPUOPT([RTEMS_ATOMIC],
    206   [test x"$rtems_cv_ATOMIC" = xyes],
    207   [1],
    208   [if cpu supports atomic operations])
    209206
    210207RTEMS_CPUOPT([RTEMS_VERSION],
     
    328325AM_CONDITIONAL(HAS_PTHREADS,test x"$rtems_cv_HAS_POSIX_API" = x"yes")
    329326AM_CONDITIONAL(LIBNETWORKING,test x"$rtems_cv_HAS_NETWORKING" = x"yes")
    330 AM_CONDITIONAL([ATOMIC],[test x"$rtems_cv_ATOMIC" = x"yes"])
    331327
    332328AM_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"])
  • cpukit/rtems/Makefile.am

    rdcd97c7 r8a9568d  
    5454include_rtems_rtems_HEADERS += include/rtems/rtems/timerimpl.h
    5555include_rtems_rtems_HEADERS += include/rtems/rtems/types.h
    56 if ATOMIC
     56if HAS_SMP
    5757include_rtems_rtems_HEADERS += include/rtems/rtems/atomic.h
    5858endif
  • cpukit/rtems/preinstall.am

    rdcd97c7 r8a9568d  
    192192PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/types.h
    193193
    194 if ATOMIC
     194if HAS_SMP
    195195$(PROJECT_INCLUDE)/rtems/rtems/atomic.h: include/rtems/rtems/atomic.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
    196196        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/atomic.h
  • cpukit/score/Makefile.am

    rdcd97c7 r8a9568d  
    8585include_rtems_score_HEADERS += include/rtems/score/cpuopts.h
    8686include_rtems_score_HEADERS += include/rtems/score/basedefs.h
    87 if ATOMIC
    88 include_rtems_score_HEADERS += include/rtems/score/atomic.h
    89 include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h
    90 endif
    9187
    9288if HAS_PTHREADS
     
    107103
    108104if HAS_SMP
     105include_rtems_score_HEADERS += include/rtems/score/atomic.h
     106include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h
    109107include_rtems_score_HEADERS += include/rtems/score/schedulersimplesmp.h
    110108endif
  • cpukit/score/preinstall.am

    rdcd97c7 r8a9568d  
    320320PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h
    321321
    322 if ATOMIC
    323 $(PROJECT_INCLUDE)/rtems/score/atomic.h: include/rtems/score/atomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    324         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/atomic.h
    325 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/atomic.h
    326 
    327 $(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h: include/rtems/score/cpustdatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    328         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h
    329 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h
    330 endif
    331322if HAS_PTHREADS
    332323$(PROJECT_INCLUDE)/rtems/score/corespinlock.h: include/rtems/score/corespinlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     
    368359endif
    369360if HAS_SMP
     361$(PROJECT_INCLUDE)/rtems/score/atomic.h: include/rtems/score/atomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     362        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/atomic.h
     363PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/atomic.h
     364
     365$(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h: include/rtems/score/cpustdatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     366        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h
     367PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h
     368
    370369$(PROJECT_INCLUDE)/rtems/score/schedulersimplesmp.h: include/rtems/score/schedulersimplesmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    371370        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimplesmp.h
  • testsuites/smptests/Makefile.am

    rdcd97c7 r8a9568d  
    1111SUBDIRS += smp08
    1212SUBDIRS += smp09
    13 if ATOMIC
    1413SUBDIRS += smpatomic01
    15 endif
    1614SUBDIRS += smplock01
    1715SUBDIRS += smpmigration01
  • testsuites/smptests/configure.ac

    rdcd97c7 r8a9568d  
    2323RTEMS_CANONICALIZE_TOOLS
    2424
    25 RTEMS_CHECK_CPUOPTS([RTEMS_ATOMIC])
    2625RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API])
    2726
     
    3433AM_CONDITIONAL(SMPTESTS,test "$rtems_cv_RTEMS_SMP" = "yes")
    3534
    36 AM_CONDITIONAL([ATOMIC],[test x"$rtems_cv_RTEMS_ATOMIC" = xyes])
    3735AM_CONDITIONAL([HAS_POSIX],[test x"${rtems_cv_RTEMS_POSIX_API}" = xyes])
    3836
Note: See TracChangeset for help on using the changeset viewer.