From b2938459f8003cd5ed1484603e228d73afbe0d9b Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Wed, 28 Aug 2019 15:28:08 -0500
Subject: [PATCH] Define pdevLibVME on non-VME RTEMS targets

---
 documentation/RELEASE_NOTES.html               | 14 +++++++++++++-
 modules/libcom/src/osi/os/RTEMS/devLibVMEOSD.c |  7 ++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 103e5a957..10910080d 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -20,7 +20,7 @@ release.</p>
 which should also be read to understand what has changed since an earlier
 release.</p>
 
-<h1 align="center">EPICS Release 7.0.3</h1>
+<h1 align="center">EPICS Release 7.0.3.1</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -30,6 +30,18 @@ release.</p>
 
 -->
 
+<h3>Non-VME RTEMS targets now define pdevLibVME</h3>
+
+<p>Previously IOC executables that made calls to devLib routines would fail to
+link when built for some non-VME based RTEMS targets, which would have to be
+explicitly filtered out by sites that build Base for those targets.
+<a href="https://bugs.launchpad.net/epics-base/+bug/1841692">This fix</a> makes
+that no longer necessary, all RTEMS targets should now link although the IOC
+won't be able to be used with the VME I/O on those systems (that we don't have
+VMEbus I/O support for in libCom).</p>
+
+<h1 align="center">EPICS Release 7.0.3</h1>
+
 <h3>epicsTimeGetCurrent() optimization</h3>
 
 <p>Add a fast path to epicsTimeGetCurrent() and related calls
diff --git a/modules/libcom/src/osi/os/RTEMS/devLibVMEOSD.c b/modules/libcom/src/osi/os/RTEMS/devLibVMEOSD.c
index 0a96bad1a..b8f79e706 100644
--- a/modules/libcom/src/osi/os/RTEMS/devLibVMEOSD.c
+++ b/modules/libcom/src/osi/os/RTEMS/devLibVMEOSD.c
@@ -350,7 +350,12 @@ static void unsolicitedHandlerEPICS(int vectorNumber)
         );
 }
 
-#endif /* defined(__PPC__) && defined(mpc750) */
+#else /* !defined(__PPC__) && !defined(__mcf528x__) */
+
+/* No known VME interface here, provide a dummy */
+devLibVME *pdevLibVME;
+
+#endif /* defined(__PPC__) || defined(__mcf528x__) */
 
 /*
  * Some vxWorks convenience routines