fix problem with not working epicsSocketAccept() on moxa42-armv6l

configure/os/CONFIG.Common.RHEL8-x86_64-clang

@@ -1 +1,3 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.moxa42-armv6l

@@ -17,3 +17,7 @@ ARCH_DEP_CFLAGS += -funwind-tables
 
 # have no full C++11
 STD_CXXFLAGS = -std=c++0x
+
+# accept4() exists but does not work
+# Give fake __rtems__ macro to posix/osdSock.c because that disables accept4()
+osdSock_CFLAGS += -D__rtems__

configure/os/CONFIG.Cross_64.RHEL7-x86_64

@@ -0,0 +1,21 @@
+# "cross compile" for RHEL7-x86_64 on other 64 bit Linux version
+# Expects RHEL7 RPMs c++ and readline-devel installed in $(SYSROOT)
+# This can be installed on RHEL7 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+# Optionally use a newer toolset (installed on $(SYSROOT)).
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+SYSROOT          = /opt/RHEL7
+TOOLSET_LOCATION = /opt/rh
+
+# Do NOT set GNU_BIN (or else ...)!
+TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
+CC  = $(SYSROOT)$(TOOLSET_DIR)/bin/gcc
+CCC = $(SYSROOT)$(TOOLSET_DIR)/bin/g++
+# Set LD_LIBRARY_PATH and BFLAG only with TOOLSET
+LD_LIBRARY_PATH  = $(if $(TOOLSET),$(SYSROOT)$(TOOLSET_DIR)/lib64)
+BFLAG            = $(if $(TOOLSET),-B$(SYSROOT)$(TOOLSET_DIR)/bin)
+TARGET_CPPFLAGS += --sysroot=$(SYSROOT) $(BFLAG)
+TARGET_LDFLAGS  += --sysroot=$(SYSROOT) $(BFLAG)

configure/os/CONFIG.Linux.win32-x86

@@ -0,0 +1,4 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)

configure/os/CONFIG.Linux.windows-x64

@@ -0,0 +1,4 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)

configure/os/CONFIG.RHEL7-x86_64.win32-x86

@@ -1,3 +1 @@
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
-
-PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.win32-x86

configure/os/CONFIG.RHEL7-x86_64.windows-x64

@@ -1,3 +1 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64

@@ -0,0 +1,4 @@
+include $(CONFIG)/os/CONFIG.Cross_64.RHEL7-x86_64
+
+#TOOLSET = devtoolset-11
+#STD_CXXFLAGS = -std=c++17

configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64

@@ -1,2 +1,8 @@
 # Include common linux definitions
 include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# Use gcc 11 from gcc-toolset-11
+GNU_BIN = /opt/rh/gcc-toolset-11/root/usr/bin
+# Fix bug in gcc-toolset-11 calling the old assembler
+TARGET_CFLAGS += -B$(GNU_BIN)
+STD_CXXFLAGS = -std=c++17

configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a

@@ -0,0 +1 @@
+GNU_BIN=/opt/RHEL7/bin

configure/os/CONFIG.RHEL8-x86_64.win32-x86

@@ -1,5 +1 @@
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
-
-PATH_FILTER = $(subst /,/,$(1))
-
-PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.win32-x86

configure/os/CONFIG.RHEL8-x86_64.windows-x64

@@ -1,5 +1 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-PATH_FILTER = $(subst /,/,$(1))
-
-PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -1 +1,18 @@
 include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
+
+# Build for old SL6 64 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64
+
+# Build for old SL6 32 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+# Not available on RHEL8
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -4,18 +4,8 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
 CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
 
 # Build for old RHEL7 64 bit
-#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
-
-# Build for old SL6 64 bit
-#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
-
-# Build for old SL6 32 bit
-#CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
 
 # NI Linux Real-Time 7.x
 # requires RPM gcc-c++-arm-linux-gnu
-# not available yet for RHEL8
-#CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
-
-# Windows cross builds using Wine
-CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -11,27 +11,18 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
 
 GNU_HOST_ARCH_64=x86_64
 
-# Improved error checking with clang
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
-CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
-
-# Build for old SL6 64 bit
-CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
-CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64
-
-# Build for old SL6 32 bit
-CROSS_COMPILER_TARGET_ARCHS += SL6-x86
-CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86
-
-# NI Linux Real-Time 7.x
-# requires RPM gcc-c++-arm-linux-gnu
-CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
-
 # Windows cross builds using Wine
 CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64
+
 # IOxOS IFC1211
 CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
 
 # Zynq
 CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
 CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
+
+# Debian 10
+CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
+
+# Newer DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP

modules/database/src/ioc/db/dbEvent.c

@@ -789,6 +789,18 @@ static void db_queue_event_log (evSubscrip *pevent, db_field_log *pLog)
 
     LOCKEVQUE (ev_que);
 
+    /* if we have an event on the queue and both the last
+     * event on the queue and the current event are empty,
+     * simply ignore duplicate events.
+     */
+    if (pevent->npend > 0u
+            && !dbfl_has_copy(*pevent->pLastLog)
+            && !dbfl_has_copy(pLog)) {
+        db_delete_field_log(pLog);
+        UNLOCKEVQUE (ev_que);
+        return;
+    }
+
     /*
      * add to task local event que
      */

modules/database/src/ioc/dbStatic/dbStaticLib.c

@@ -2197,12 +2197,12 @@ long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec)
              */
 
         } else if(dbCanSetLink(plink, &link_info, devsup)!=0) {
-            errlogPrintf("Error: %s.%s: can't initialize link type %d with \"%s\" (type %d)\n",
-                         prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
+            errlogPrintf("Error: %s.%s: can't initialize link type %s with \"%s\" (type %s)\n",
+                         prec->name, pflddes->name, pamaplinkType[plink->type], plink->text, pamaplinkType[link_info.ltype]);
 
         } else if(dbSetLink(plink, &link_info, devsup)) {
-            errlogPrintf("Error: %s.%s: failed to initialize link type %d with \"%s\" (type %d)\n",
-                         prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
+            errlogPrintf("Error: %s.%s: failed to initialize link type %s with \"%s\" (type %s)\n",
+                         prec->name, pflddes->name, pamaplinkType[plink->type], plink->text, pamaplinkType[link_info.ltype]);
         }
         free(plink->text);
         plink->text = NULL;