Merge ~epics-core/epics-base/+git/rtems5:hj/rtems5 into ~epics-core/epics-base/+git/epics-base:core/master

[Heinz Junkes]

[mdavidsaver (mdavidsaver)]

This work has moved to https://github.com/epics-base/epics-base/pull/23

review: Disapprove

Unmerged commits

c4f6beb... by Heinz Junkes on 2018-03-27

Add support for Rtems 5

Rtems recommends the posix api for new developments to enable the use of
SMP in the future. To support multiple APIs in the same OS the GNUmake
variable $(OS_API) have been incorporated.

diff --git a/.gitignore b/.gitignore
index af33a79..51cba4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ O.*/
 *.orig
 *.log
 .*.swp
+/nbproject/
\ No newline at end of file
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 79807c2..a5f47ea 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 #
 #  CONFIG_COMMON
@@ -136,10 +136,11 @@ BUILDLIB_SUFFIX = $(BUILDLIB_SUFFIX_$(SHARED_LIBRARIES))
 #--------------------------------------------------
 # vpath directories
 POSIX_YES = os/posix
+OS_IMPL_DIRS = $(if $(OS_API),os/$(OS_CLASS)-$(OS_API),) os/$(OS_CLASS)
 GENERIC_SRC_DIRS = .. $(SRC_DIRS)
-OS_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
-       $(addprefix $(dir)/, os/$(OS_CLASS) $(POSIX_$(POSIX)) os/default ))
-CMPLR_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
+OS_SRC_DIRS += . $(foreach dir, $(GENERIC_SRC_DIRS), \
+       $(addprefix $(dir)/, $(OS_IMPL_DIRS) $(POSIX_$(POSIX)) os/default ))
+CMPLR_SRC_DIRS += . $(foreach dir, $(GENERIC_SRC_DIRS), \
        $(addprefix $(dir)/, compiler/$(CMPLR_CLASS) compiler/default ))
 ALL_SRC_DIRS = $(CMPLR_SRC_DIRS) $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
@@ -261,7 +262,7 @@ LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
 #--------------------------------------------------
-# prefix, suffix, and ldflags for loadable shared libraries 
+# prefix, suffix, and ldflags for loadable shared libraries
 TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
 LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
 LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
@@ -459,5 +460,5 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
 SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
 SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
 SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
- 
+
 endif
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index b657f5b..85329c0 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -107,7 +107,7 @@
 # Which target architectures to cross-compile for.
 #  Definitions in configure/os/CONFIG_SITE.<host>.Common
 #  may override this setting.
-CROSS_COMPILER_TARGET_ARCHS=
+CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik
 #CROSS_COMPILER_TARGET_ARCHS=vxWorks-ppc32
 
 # If only some of your host architectures can compile the
diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS
index c22e37a..c34bfe1 100644
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -91,14 +91,27 @@ MODEXT=.obj
 OS_CLASS = RTEMS
 
 #--------------------------------------------------
+# operating system API (src/os/<os_class>-<os-api>)
+OS_API_4.7 = kernel
+OS_API_4.8 = kernel
+OS_API_4.9 = kernel
+OS_API_4.10 = kernel
+OS_API_4.11 = $(error RTEMS-4-11 is not currently supported)
+# Later RTEMS versions will use posix, no need to specify
+OS_API = $(firstword $(OS_API_$(RTEMS_SERIES)) posix)
+
+#--------------------------------------------------
 # Operating system flags
 OP_SYS_LDLIBS += -lrtemsCom -lc -lrtemscpu -lCom -lnfs -lm
-OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
+
+OP_SYS_LDFLAGS_posix += -u POSIX_Init
+OP_SYS_LDFLAGS_kernel += -u Init \
                  $(PROJECT_RELEASE)/lib/no-dpmem.rel \
                  $(PROJECT_RELEASE)/lib/no-mp.rel \
                  $(PROJECT_RELEASE)/lib/no-part.rel \
                  $(PROJECT_RELEASE)/lib/no-signal.rel \
                  $(PROJECT_RELEASE)/lib/no-rtmon.rel
+OP_SYS_LDFLAGS += $(CPU_CFLAGS) $(OP_SYS_LDFLAGS_$(OS_API))
 
 MOD_SYS_LDFLAGS += $(CPU_CFLAGS) -Wl,-r -nostdlib
 
diff --git a/configure/os/CONFIG.Common.RTEMS-beatnik b/configure/os/CONFIG.Common.RTEMS-beatnik
index aaf6116..ed30e2e 100644
--- a/configure/os/CONFIG.Common.RTEMS-beatnik
+++ b/configure/os/CONFIG.Common.RTEMS-beatnik
@@ -7,7 +7,8 @@
 EXE = .elf
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
-ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+# will use bootp
+#ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
 ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048
 ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS
index 0b5d227..2b72811 100644
--- a/configure/os/CONFIG_SITE.Common.RTEMS
+++ b/configure/os/CONFIG_SITE.Common.RTEMS
@@ -3,11 +3,26 @@
 # Site-specific information for all RTEMS targets
 #-------------------------------------------------------
 
+# RTEMS Series and Version
+
+#RTEMS_SERIES = 4.9
+#RTEMS_VERSION = 4.9.2
+
+#RTEMS_SERIES = 4.10
+#RTEMS_VERSION = 4.10.2
+
+#RTEMS_SERIES = 5
+#RTEMS_VERSION = 5
+
 # Where to find RTEMS
 #
 # APS:
 RTEMS_VERSION = 4.10.2
 RTEMS_BASE = /usr/local/vw/rtems/rtems-$(RTEMS_VERSION)
+# FHI:
+RTEMS_SERIES = 5
+RTEMS_VERSION = 5
+RTEMS_BASE = /Users/junkes/RTEMS/rtems-$(RTEMS_VERSION)
 
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index d798b50..8c7a13d 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -17,6 +17,38 @@
 <p>Description</p>
 
 -->
+<h3>Support for RTEMS 5</h3>
+
+<p>The next major release of the RTEMS real-time OS will be version 5 which
+contains many changes including the ability to support SMP systems. The earlier
+EPICS support for RTEMS made use of various RTEMS-specific kernel APIs which
+cannot be used on an SMP system, so the changes here required a completely new
+port to the Posix real-time APIs that RTEMS-5 now recommends. A new RTEMS
+configuration variable RTEMS_SERIES has been added which should be set to the
+OS version number, e.g. 4.9. When this is 5 (first release is without minor 
+number) or greater the new libCom/osi/os/RTEMS-posix source files will be used;
+the older API source files can now be found in libCom/osi/os/RTEMS-kernel, and
+those which are common to both installations are in libCom/osi/os/RTEMS. The
+same distinction will also apply to libCom/RTEMS. Configs rtems_[net]config.c
+can be found either in libCom/RTEMS/kernel for rtems &lt; 5 and 
+libCom/RTEMS/posix from version 5+ on.
+</p>
+
+<p>Note that EPICS Base can only be built for a single RTEMS version at a time.
+  The RTEMS version number is set in the CONFIG_SITE.Common.RTEMS file and
+  cannot be different for specific targets. This allows different header files
+  to be used and installed for the two different APIs.</p>
+
+<h3>Support for multiple APIs in the same OS</h3>
+
+<p>The build configuration files for a particular build target may now select
+between multiple implementations with different OS APIs by setting the GNUmake
+variable <kbd>OS_API</kbd>. This changes the search path used for OS-specific
+source files, inserting a directory <kbd>os/$(OS_CLASS)-$(OS_API)</kbd> before
+the existing <kbd>os/$(OS_CLASS)</kbd> directory. Note though that the include
+file search path does not change, so OS-specific header files must be able to
+handle both APIs simultaneously, and their source files should go in the
+<kbd>os/$(OS_CLASS)</kbd> directory.</p>
 
 <h1 align="center">EPICS Release 7.0.1.1</h1>