From 9d23df2fbce8311a13067e56d3752ed3470079e4 Mon Sep 17 00:00:00 2001 From: WeiY Date: Fri, 25 Jan 2013 23:53:52 +0800 Subject: score: atomic support for RTEMS automake and autoconf changes --- cpukit/rtems/Makefile.am | 1 + cpukit/rtems/preinstall.am | 4 ++++ cpukit/score/Makefile.am | 4 +++- cpukit/score/cpu/i386/Makefile.am | 1 + cpukit/score/cpu/i386/preinstall.am | 4 ++++ cpukit/score/cpu/powerpc/Makefile.am | 1 + cpukit/score/cpu/powerpc/preinstall.am | 4 ++++ cpukit/score/preinstall.am | 12 ++++++++++++ testsuites/smptests/Makefile.am | 7 +++++++ testsuites/smptests/configure.ac | 7 +++++++ testsuites/sptests/Makefile.am | 4 +++- testsuites/sptests/configure.ac | 7 +++++++ 12 files changed, 54 insertions(+), 2 deletions(-) diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 6295990a74..768d451588 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -39,6 +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 +include_rtems_rtems_HEADERS += include/rtems/rtems/atomic.h include_rtems_rtems_HEADERS += mainpage.h if HAS_MP diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am index c91e508ef2..f64600fe10 100644 --- a/cpukit/rtems/preinstall.am +++ b/cpukit/rtems/preinstall.am @@ -127,6 +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 +$(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 + $(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 d9471c3770..cdfe3c6b1f 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -57,7 +57,8 @@ 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 - +include_rtems_score_HEADERS += include/rtems/score/atomic.h +include_rtems_score_HEADERS += include/rtems/score/genericcpuatomic.h if HAS_SMP include_rtems_score_HEADERS += include/rtems/score/smplock.h include_rtems_score_HEADERS += include/rtems/score/smp.h @@ -105,6 +106,7 @@ include_rtems_score_HEADERS += inline/rtems/score/tod.inl include_rtems_score_HEADERS += inline/rtems/score/tqdata.inl include_rtems_score_HEADERS += inline/rtems/score/watchdog.inl include_rtems_score_HEADERS += inline/rtems/score/wkspace.inl +include_rtems_score_HEADERS += inline/rtems/score/atomic.inl if HAS_PTHREADS include_rtems_score_HEADERS += inline/rtems/score/corespinlock.inl diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am index b9caa3381a..d25002d390 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -10,6 +10,7 @@ include_rtems_score_HEADERS += rtems/score/types.h include_rtems_score_HEADERS += rtems/score/interrupts.h include_rtems_score_HEADERS += rtems/score/registers.h include_rtems_score_HEADERS += rtems/score/idtr.h +include_rtems_score_HEADERS += rtems/score/cpuatomic.h noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S diff --git a/cpukit/score/cpu/i386/preinstall.am b/cpukit/score/cpu/i386/preinstall.am index 7bf7af259a..060176be04 100644 --- a/cpukit/score/cpu/i386/preinstall.am +++ b/cpukit/score/cpu/i386/preinstall.am @@ -51,3 +51,7 @@ $(PROJECT_INCLUDE)/rtems/score/idtr.h: rtems/score/idtr.h $(PROJECT_INCLUDE)/rte $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/idtr.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/idtr.h +$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h + diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index e8b2f920c7..7fd64ef7cf 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -7,6 +7,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/powerpc.h include_rtems_score_HEADERS += rtems/score/cpu.h include_rtems_score_HEADERS += rtems/score/types.h +include_rtems_score_HEADERS += rtems/score/cpuatomic.h include_rtems_powerpcdir = $(includedir)/rtems/powerpc include_rtems_powerpc_HEADERS = rtems/powerpc/registers.h diff --git a/cpukit/score/cpu/powerpc/preinstall.am b/cpukit/score/cpu/powerpc/preinstall.am index 99e3bd0aaf..32934982f4 100644 --- a/cpukit/score/cpu/powerpc/preinstall.am +++ b/cpukit/score/cpu/powerpc/preinstall.am @@ -39,6 +39,10 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h +$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h + $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/powerpc @: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index e887758e17..4295df4a8a 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -211,6 +211,14 @@ $(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 +$(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 + +$(PROJECT_INCLUDE)/rtems/score/genericcpuatomic.h: include/rtems/score/genericcpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/genericcpuatomic.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/genericcpuatomic.h + 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 @@ -347,6 +355,10 @@ $(PROJECT_INCLUDE)/rtems/score/wkspace.inl: inline/rtems/score/wkspace.inl $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/wkspace.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/wkspace.inl +$(PROJECT_INCLUDE)/rtems/score/atomic.inl: inline/rtems/score/atomic.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/atomic.inl +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/atomic.inl + if HAS_PTHREADS $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl: inline/rtems/score/corespinlock.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am index 02975a45a5..7fc0066923 100644 --- a/testsuites/smptests/Makefile.am +++ b/testsuites/smptests/Makefile.am @@ -12,6 +12,13 @@ SUBDIRS += smp06 SUBDIRS += smp07 SUBDIRS += smp08 SUBDIRS += smp09 +SUBDIRS += smpatomic01 +SUBDIRS += smpatomic02 +SUBDIRS += smpatomic03 +SUBDIRS += smpatomic04 +SUBDIRS += smpatomic05 +SUBDIRS += smpatomic06 +SUBDIRS += smpatomic07 endif include $(top_srcdir)/../automake/subdirs.am diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac index 8a289f7d8f..89af86863b 100644 --- a/testsuites/smptests/configure.ac +++ b/testsuites/smptests/configure.ac @@ -41,5 +41,12 @@ smp06/Makefile smp07/Makefile smp08/Makefile smp09/Makefile +smpatomic01/Makefile +smpatomic02/Makefile +smpatomic03/Makefile +smpatomic04/Makefile +smpatomic05/Makefile +smpatomic06/Makefile +smpatomic07/Makefile ]) AC_OUTPUT diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index c00d73c3e7..c9d20dd5ab 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -27,7 +27,9 @@ SUBDIRS = \ spintrcritical17 spintrcritical18 spmkdir spmountmgr01 spheapprot \ spsimplesched01 spsimplesched02 spsimplesched03 spnsext01 \ spedfsched01 spedfsched02 spedfsched03 \ - spcbssched01 spcbssched02 spcbssched03 spqreslib sptimespec01 + spcbssched01 spcbssched02 spcbssched03 spqreslib sptimespec01 \ + spatomic01 spatomic02 spatomic03 spatomic04 spatomic05 \ + spatomic06 spatomic07 SUBDIRS += spfatal26 SUBDIRS += speventtransient01 SUBDIRS += speventsystem01 diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 6d899a3a09..a43a1ad2c7 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -112,6 +112,13 @@ sp76/Makefile sp77/Makefile sp2038/Makefile spassoc01/Makefile +spatomic01/Makefile +spatomic02/Makefile +spatomic03/Makefile +spatomic04/Makefile +spatomic05/Makefile +spatomic06/Makefile +spatomic07/Makefile spcbssched01/Makefile spcbssched02/Makefile spcbssched03/Makefile -- cgit v1.2.3