Merge branch 'master' of rmc-github.robotic.dlr.de:common/libosal

Author: robert-burger

Makefile.am

@@ -6,12 +6,14 @@ pkgconfigdir=$(libdir)/pkgconfig
 SUBDIRS=src
 
 if LIBOSAL_BUILD_POSIX
+if !LIBOSAL_BUILD_RTEMS
 SUBDIRS += tests
 if !LIBOSAL_BUILD_MINGW32
 SUBDIRS += src/tools/logger 
 SUBDIRS += src/tools/shmtest
 endif
 endif
+endif
 
 pkgconfig_DATA = libosal.pc
 

Makefile.doc

@@ -7,7 +7,7 @@ SOURCEDIR         = ./
 BUILDDIR          = $(SOURCEDIR)/docs
 GH_PAGES_DIR_NAME = gh-pages
 BRANCH_DIR_NAME   = $(subst /,_,$(BRANCH_NAME))
-BUILDCMD          = cissy run -c $(SOURCEDIR) -p doxygen/[~=1.8]@3rdparty/stable doxygen
+BUILDCMD          = cissy run -c $(SOURCEDIR) -p doxygen/1.10.0@3rdparty/stable doxygen
 DOCS              = "$(GH_PAGES_DIR_NAME)/$(BRANCH_DIR_NAME)"
 
 .PHONY: Makefile.doc gh-pages

RMC-Jenkinsfile

@@ -1,4 +1,4 @@
-@Library('rmc-jenkins-libraries-v2-no-changelog') _
+@Library('rmc-jenkins-libraries-v3') _
 env.CONAN_V2_MODE=1
 rmcBuild.auto()
 
@@ -8,8 +8,11 @@ node('default') {
         context.getGitRepo().checkout()
         sshagent(credentials: [context.getConfig().gitCredentialsId]) {
             lock("gh-pages-${context.getGitRepo().getOrganization()}-${context.getGitRepo().getName()}") {
-                sh """
-                export CONAN_USER_HOME=${pwd()}/conan_home
+                sh """#!/bin/bash
+                set +x
+                source /opt/rmc-build-tools/sourceme-devel.sh --cissy /opt/rmc-build-tools/any/cissy2/
+                set -x
+                export CONAN_HOME=${pwd()}/conan_home
                 cd repo_dir
                 make -f Makefile.doc gh-pages
                 """

config.sub

@@ -1497,8 +1497,11 @@ case $os in
 	dicos*)
 		os=dicos
 		;;
+	rtems*)
+		os=rtems
+		;;
 	pikeos*)
-        os=pikeos
+		os=pikeos
 		;;
 	*)
 		# No normalization, but not necessarily accepted, that comes below.
@@ -1707,8 +1710,10 @@ case $os in
 	# Likewise for "kernel-abi"
 	eabi* | gnueabi*)
 		;;
-    pikeos*)
-        ;;
+	rtems*)
+		;;
+	pikeos*)
+		;;
 	# VxWorks passes extra cpu info in the 4th filed.
 	simlinux | simwindows | spe)
 		;;

configure.ac.in

@@ -6,27 +6,36 @@ AC_INIT([libosal], [PACKAGE_VERSION], [Robert Burger <robert.burger@dlr.de>])
 
 AC_CANONICAL_TARGET
 
+AS_IF([echo "$host" | grep -q 'rtems'], [
+    AC_MSG_NOTICE([RTEMS detected: skipping compiler test])
+    AC_SUBST(CC, arm-rtems6-gcc)
+    AC_SUBST(CXX, arm-rtems6-g++)
+    ac_cv_prog_cc_works=yes
+    ac_cv_prog_cc_cross=yes
+    ac_cv_exeext=
+], [
+    # Checks for programs.
+    AC_PROG_CC
+
+    # we test the posix API with gtest, which requires C++
+    AC_PROG_CXX
+])
+
 # Automake initialization
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
-#AM_INIT_AUTOMAKE([-Wall -Werror foreign silent-rules subdir-objects])
-#m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
-
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADERS([config.h include/libosal/osal.h])
 AC_CONFIG_MACRO_DIR([m4])
 AX_PREFIX_CONFIG_H(include/libosal/config.h) # prep mylib/_config.h from it..
 
-# Checks for programs.
-AC_PROG_CC
-# we test the posix API with gtest, which requires C++
-AC_PROG_CXX
 AC_PROG_LIBTOOL
 
 LT_INIT
 
 LIBOSAL_BUILD_POSIX=false
+LIBOSAL_BUILD_RTEMS=false
 LIBOSAL_BUILD_MINGW32=false
 LIBOSAL_BUILD_VXWORKS=false
 LIBOSAL_BUILD_PIKEOS=false
@@ -44,6 +53,12 @@ case $target_os in
         LIBOSAL_BUILD_POSIX=true
         AC_DEFINE([LIBOSAL_BUILD_POSIX], [true], [Use POSIX build on linux])
         ;;
+    rtems*)
+        LIBOSAL_BUILD_POSIX=true
+        LIBOSAL_BUILD_RTEMS=true
+        AC_DEFINE([LIBOSAL_BUILD_POSIX], [true], [Use POSIX build on RTEMS])
+        AC_DEFINE([LIBOSAL_BUILD_RTEMS], [true], [Use POSIX build on RTEMS])
+        ;;
     vxworks*)
         LIBOSAL_BUILD_VXWORKS=true
         AC_DEFINE([LIBOSAL_BUILD_VXWORKS], [true], [Use VxWorks build])
@@ -105,6 +120,7 @@ AC_CHECK_LIB(m, sqrt, MATH_LIBS="-lm")
 AC_SUBST(MATH_LIBS)
 
 AM_CONDITIONAL([LIBOSAL_BUILD_POSIX], [ test x$LIBOSAL_BUILD_POSIX = xtrue]) 
+AM_CONDITIONAL([LIBOSAL_BUILD_RTEMS], [ test x$LIBOSAL_BUILD_RTEMS = xtrue]) 
 AM_CONDITIONAL([LIBOSAL_BUILD_MINGW32], [ test x$LIBOSAL_BUILD_MINGW32 = xtrue]) 
 AM_CONDITIONAL([LIBOSAL_BUILD_VXWORKS], [ test x$LIBOSAL_BUILD_VXWORKS = xtrue]) 
 AM_CONDITIONAL([LIBOSAL_BUILD_PIKEOS], [ test x$LIBOSAL_BUILD_PIKEOS = xtrue]) 
@@ -113,6 +129,7 @@ AM_CONDITIONAL([LIBOSAL_BUILD_WIN32], [ test x$LIBOSAL_BUILD_WIN32 = xtrue])
 # Checks for libraries.
 
 # Checks for header files.
+AC_CHECK_HEADERS([string.h])
 AC_CHECK_HEADERS([stdint.h])
 AC_CHECK_HEADERS([math.h])
 AC_CHECK_HEADERS([sys/mman.h], HAVE_SYS_MMAN_H=true, HAVE_SYS_MMAN_H=false)

rmc-build.yaml

@@ -4,6 +4,6 @@ builds:
   - any:
       coverage: False
   - imports:
-    - linux_defaults_build_profile
-  - debian11-x86_64
-  - build_profile:osl154-x86_64 pikeos4.2-armv7hf-gcc5:
+    - linux_defaults
+  - build_profile:osl155-x86_64 pikeos4.2-armv7hf-gcc5:
+  - build_profile:osl155-x86_64 rtems6.1_zedboard-armv7le-gcc13

src/Makefile.am

@@ -112,8 +112,8 @@ libosal_la_SOURCES += win32/semaphore.c
 
 endif
 
-libosal_la_CFLAGS	= -std=gnu99 -Wall -Werror $(ADD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include
-libosal_la_LDFLAGS	= -Wall -Werror $(AM_LDFLAGS) $(ADD_LIBS)
+libosal_la_CFLAGS	= -std=gnu99 -Wall $(ADD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include
+libosal_la_LDFLAGS	= -Wall $(AM_LDFLAGS) $(ADD_LIBS)
 libosal_la_LIBS     = -lm $(ADD_LIBS)
 
 install-exec-hook: 

src/pikeos/task.c

@@ -89,6 +89,7 @@ osal_retval_t osal_task_create(osal_task_t *hdl, const osal_task_attr_t *attr,
     p4ext_thr_attr_t *ptattr = NULL;
     p4ext_thr_attr_init(&tattr);
     tattr.context_flags = P4_THREAD_ARG_FPU | P4_THREAD_ARG_DEBUG;
+    tattr.stacksize = (8 * P4_PAGESIZE);
     ptattr = &tattr;
 
     if ((attr != NULL) && (attr->priority > 0)) {

src/trace.c

@@ -43,6 +43,9 @@
 
 #if LIBOSAL_HAVE_STRING_H == 1
 #include <string.h>
+#else 
+// forward decl
+void *memset(void *s, int c, size_t n);
 #endif
 
 //! \brief Allocate trace struct.