Merge ~epics-core/epics-base/+git/make:rpath-origin into ~epics-core/epics-base/+git/epics-base:7.0

[mdavidsaver]

Change to automate the creation of relative associations between shared libraries and executables (via. -rpath $ORIGIN) on Linux and other ELF targets. Also add epicsGetExecDir() to fetch the directory containing the executable which launched the running process.

These two combine to allow a complete built tree to be moved (relocated), or accessed from a different absolute path (eg. different NFS mount point).

eg.

cat <<EOF > configure/CONFIG_SITE.local
LINKER_USE_RPATH=ORIGIN
EOF
make INSTALL_LOCATION=$PWD/usr1
mv usr1 usr2
./usr2/bin/linux-x86_64/softIoc -d some.db

This also works for downstream modules, even in cases like P4P where the install path is customized.

When working with a complex install tree, the new $(LINKER_ORIGIN_ROOT) would be changed to point to eg. "$(TOP)/.." with sub-directories for Base and various modules. This ensures that linking to system libraries outside of this tree remain absolute.

[mdavidsaver (mdavidsaver)]

This change adds a small python script. I could not find a GNU Make equivalent for os.path.relpath(). So this MR will likely have to wait until someone translates this into perl.

The epicsGetExecDir() implementations for solaris and freebsd have not been tested. As both of these targets use ELF, $ORIGIN should work there. However, I have no plans to tests on either of these targets and will remove these implementations if they are a barrier to acceptance.

Also, to be clear. This is not a change to the default behavior. Unless specifically required with LINKER_USE_RPATH=ORIGIN linking continues to be done with absolute rpath.

[mdavidsaver (mdavidsaver)]

In the course of testing this I've come across two gcc/binutils bugs related to $ORIGIN. Both have been fixed, but will remain an issue for older toolchains.

Prior to binutils 2.28 -rpath $ORIGIN entries weren't correctly used to locate library dependencies. That is, when 'ld' needs to find a library on which an explicitly specified library depends.

Practically speaking this is a problem with the 'calc' module which has optional dependencies on sscan and seq. Downstream modules like streamdevice link against 'calc' without mentioning 'sscan' and 'pv'. This is apparently even stricter than is necessary for single pass static linking.

A partial workaround without side effects is to also include an absolute '-rpath-link' for every relative '-rpath'.

https://sourceware.org/bugzilla/show_bug.cgi?id=16936

I've also seen that even older gcc (circa RHEL5) seem to expand '$' variables internally before passing to 'ld'. So preventing expansion with single quotes like -Wl,-rpath,'$ORIGIN' isn't enough. It is necessary to escape once. -Wl,-rpath,'\$ORIGIN'

I haven't able to find a ticket on this one.

[mdavidsaver (mdavidsaver)]

I've been testing this idea for the past ~3 months in the context of a mini distribution 'https://github.com/mdavidsaver/build-epics'. This script produces a tar file of binaries (and source) which can be unpacked into an arbitrary location.

[Andrew Johnson (anj)]

Core group: See Notes below. ANJ to test on Solaris, and rewrite makeRPath into Perl.

[mdavidsaver (mdavidsaver)]

Updated. Now possible to give multiple values for LINKER_ORIGIN_ROOT. This allows for more complicated build environments where some libraries are in their final locations while some are in a staging area.

review: Approve

[Andrew Johnson (anj)]

Still reviewing. You completely rewrote softMain.cpp since I last looked at this, and I do intend to convert makeRPath into Perl.

review: Needs Information (hold for anj)

[Andrew Johnson (anj)]

Videocon 9/17: Merge is acceptable in principle after a review from RL.

[Martin Konrad (info-martin-konrad)]

I actually found time to review the C++ part. Looks straight forward to me. Thumbs up for printing the usage information that was hidden in a comment before.

review: Approve (c++ part only)

[Andrew Johnson (anj)]

Group 10/4: No issues.

review: Approve

diff --git a/.travis.yml b/.travis.yml
index d6130c7..e7b1ed5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ addons:
 script:
   - .ci/travis-build.sh
 env:
-  - CMPLR=gcc
+  - CMPLR=gcc EXTRA=LINKER_USE_RPATH=ORIGIN
   - CMPLR=clang
   - CMPLR=gcc   STATIC=YES
   - CMPLR=clang STATIC=YES
diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index 963b83a..0b857c2 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -45,6 +45,8 @@ FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
 TAPTOJUNIT       = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
 GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
+MAKERPATH = $(PYTHON) $(TOOLS)/makeRPath.py
+
 #---------------------------------------------------------------
 # tools for installing libraries and products
 INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index d3a6696..6f9a073 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -38,6 +38,8 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
+PYTHON = python
+
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index b657f5b..c46703f 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -169,10 +169,18 @@ EPICS_SITE_VERSION =
 GCC_PIPE = NO
 
 # Set RPATH when linking executables and libraries.
-#  Must be either YES or NO.  If you set this to NO you must also provide a
+#  Must be either YES, NO, or ORIGIN.  If you set this to NO you must also provide a
 #  way for Base executables to find their shared libraries when they are
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
+#  ORIGIN is a feature of the ELF executable format used by Linux, freebsd, and solaris.
 LINKER_USE_RPATH = YES
 
+# Only used when LINKER_USE_RPATH=ORIGIN
+# The build time root(s) of the relocatable tree (separate multiple w/ ':').
+# Linking to libraries under any root directory will be relative.
+# Linking to libraries outside of this root will be absolute.
+# All root directories are considered to be the same.
+LINKER_ORIGIN_ROOT = $(INSTALL_LOCATION)
+
 # Overrides for the settings above may appear in a CONFIG_SITE.local file
 -include $(CONFIG)/CONFIG_SITE.local
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 2a78a96..3306fb3 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -196,6 +196,13 @@ ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
 endif
 
+# $(FINAL_DIR) signals eventual install locations to makeRPath script
+$(TESTPRODNAME): FINAL_DIR=.
+$(PRODNAME): FINAL_DIR=$(INSTALL_BIN)
+$(TESTSHRLIBNAME): FINAL_DIR=.
+$(SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+$(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+
 #---------------------------------------------------------------
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
diff --git a/configure/os/CONFIG.Common.linuxCommon b/configure/os/CONFIG.Common.linuxCommon
index 965de09..e8e9ab3 100644
--- a/configure/os/CONFIG.Common.linuxCommon
+++ b/configure/os/CONFIG.Common.linuxCommon
@@ -25,11 +25,13 @@ STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
 # Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
 SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_RPATH_LDFLAGS_ORIGIN_NO = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
     $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
 # Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
 PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_RPATH_LDFLAGS_ORIGIN_NO = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
     $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
diff --git a/modules/database/src/std/softIoc/softMain.cpp b/modules/database/src/std/softIoc/softMain.cpp
index 8400a65..bc945c8 100644
--- a/modules/database/src/std/softIoc/softMain.cpp
+++ b/modules/database/src/std/softIoc/softMain.cpp
@@ -9,225 +9,237 @@
 
 /* Author: Andrew Johnson	Date: 2003-04-08 */
 
-/* Usage:
- *  softIoc [-D softIoc.dbd] [-h] [-S] [-s] [-a ascf]
- *	[-m macro=value,macro2=value2] [-d file.db]
- *	[-x prefix] [st.cmd]
- *
- *  If used the -D option must come first, and specify the
- *  path to the softIoc.dbd file.  The compile-time install
- *  location is saved in the binary as a default.
- *
- *  Usage information will be printed if -h is given, then
- *  the program will exit normally.
- *
- *  The -S option prevents an interactive shell being started
- *  after all arguments have been processed.
- *
- *  Previous versions accepted a -s option to cause a shell
- *  to be started; this option is still accepted but ignored
- *  since a command shell is now started by default.
- *
- *  Access Security can be enabled with the -a option giving
- *  the name of the configuration file; if any macros were
- *  set with -m before the -a option was given, they will be
- *  used as access security substitution macros.
- *
- *  Any number of -m and -d arguments can be interspersed;
- *  the macros are applied to the following .db files.  Each
- *  later -m option causes earlier macros to be discarded.
- *
- *  The -x option loads the softIocExit.db with the macro
- *  IOC set to the string provided.  This database contains
- *  a subroutine record named $(IOC):exit which has its field
- *  SNAM set to "exit".  When this record is processed, the
- *  subroutine that runs will call epicsExit() with the value
- *  of the field A determining whether the exit status is
- *  EXIT_SUCCESS if (A == 0.0) or EXIT_FAILURE (A != 0.0).
- *
- *  A st.cmd file is optional.  If any databases were loaded
- *  the st.cmd file will be run *after* iocInit.  To perform
- *  iocsh commands before iocInit, all database loading must
- *  be performed by the script itself, or by the user from
- *  the interactive IOC shell.
- */
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
+#include <iostream>
+#include <string>
+#include <list>
+#include <stdexcept>
 
+#include <epicsGetopt.h>
 #include "registryFunction.h"
 #include "epicsThread.h"
 #include "epicsExit.h"
 #include "epicsStdio.h"
+#include "epicsString.h"
 #include "dbStaticLib.h"
 #include "subRecord.h"
 #include "dbAccess.h"
 #include "asDbLib.h"
 #include "iocInit.h"
 #include "iocsh.h"
+#include "osiFileName.h"
 #include "epicsInstallDir.h"
 
 extern "C" int softIoc_registerRecordDeviceDriver(struct dbBase *pdbbase);
 
-#define DBD_FILE EPICS_BASE "/dbd/softIoc.dbd"
-#define EXIT_FILE EPICS_BASE "/db/softIocExit.db"
+#ifndef EPICS_BASE
+// so IDEs knows EPICS_BASE is a string constant
+#  define EPICS_BASE "/"
+#  error -DEPICS_BASE required
+#endif
 
-const char *arg0;
-const char *base_dbd = DBD_FILE;
-const char *exit_db = EXIT_FILE;
+#define DBD_BASE "dbd/softIoc.dbd"
+#define EXIT_BASE "db/softIocExit.db"
+#define DBD_FILE_REL "../../" DBD_BASE
+#define EXIT_FILE_REL "../../" EXIT_BASE
+#define DBD_FILE EPICS_BASE "/" DBD_BASE
+#define EXIT_FILE EPICS_BASE "/" EXIT_BASE
 
+namespace {
 
 static void exitSubroutine(subRecord *precord) {
     epicsExitLater((precord->a == 0.0) ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
-static void usage(int status) {
-    printf("Usage: %s [-D softIoc.dbd] [-h] [-S] [-a ascf]\n", arg0);
-    puts("\t[-m macro=value,macro2=value2] [-d file.db]");
-    puts("\t[-x prefix] [st.cmd]");
-    puts("Compiled-in path to softIoc.dbd is:");
-    printf("\t%s\n", base_dbd);
-    epicsExit(status);
+void usage(const char *arg0, const std::string& base_dbd) {
+    std::cout<<"Usage: "<<arg0<<
+               " [-D softIoc.dbd] [-h] [-S] [-s] [-a ascf]\n"
+               "[-m macro=value,macro2=value2] [-d file.db]\n"
+               "[-x prefix] [st.cmd]\n"
+               "\n"
+               "    -D <dbd>  If used, must come first. Specify the path to the softIoc.dbdfile."
+               "        The compile-time install location is saved in the binary as a default.\n"
+               "\n"
+               "    -h  Print this mesage and exit.\n"
+               "\n"
+               "    -S  Prevents an interactive shell being started.\n"
+               "\n"
+               "    -s  Previously caused a shell to be started.  Now accepted and ignored.\n"
+               "\n"
+               "    -a <acf>  Access Security configuration file.  Macro substitution is\n"
+               "        performed.\n"
+               "\n"
+               "    -m <MAC>=<value>,... Set/replace macro definitions used by subsequent -d and\n"
+               "        -a.\n"
+               "\n"
+               "    -d <db>  Load records from file (dbLoadRecords).  Macro substitution is\n"
+               "        performed.\n"
+               "\n"
+               "    -x <prefix>  Load softIocExit.db.  Provides a record \"<prefix>:exit\".\n"
+               "        Put 0 to exit with success, or non-zero to exit with an error.\n"
+               "\n"
+               "Any number of -m and -d arguments can be interspersed; the macros are applied\n"
+               "to the following .db files.  Each later -m option causes earlier macros to be\n"
+               "discarded.\n"
+               "\n"
+               "A st.cmd file is optional.  If any databases were loaded the st.cmd file will\n"
+               "be run *after* iocInit.  To perform iocsh commands before iocInit, all database\n"
+               "loading must be performed by the script itself, or by the user from the\n"
+               "interactive IOC shell.\n"
+               "\n"
+               "Compiled-in path to softIoc.dbd is:\n"
+               "\t"<<base_dbd.c_str()<<"\n";
 }
 
-
-int main(int argc, char *argv[])
+void errIf(int ret, const std::string& msg)
 {
-    char *dbd_file = const_cast<char*>(base_dbd);
-    char *macros = NULL;
-    char xmacro[PVNAME_STRINGSZ + 4];
-    int startIocsh = 1;	/* default = start shell */
-    int loadedDb = 0;
-    
-    arg0 = strrchr(*argv, '/');
-    if (!arg0) {
-	arg0 = *argv;
-    } else {
-	++arg0;	/* skip the '/' */
-    }
-    
-    --argc, ++argv;
-    
-    /* Do this here in case the dbd file not available */
-    if (argc>0 && **argv=='-' && (*argv)[1]=='h') {
-	usage(EXIT_SUCCESS);
-    }
-    
-    if (argc>1 && **argv=='-' && (*argv)[1]=='D') {
-	dbd_file = *++argv;
-	argc -= 2;
-	++argv;
-    }
-    
-    if (dbLoadDatabase(dbd_file, NULL, NULL)) {
-	epicsExit(EXIT_FAILURE);
-    }
-    
+    if(ret)
+        throw std::runtime_error(msg);
+}
+
+void lazy_dbd(const std::string& dbd_file) {
+    static bool loaded;
+    if(loaded) return;
+    loaded = true;
+
+    errIf(dbLoadDatabase(dbd_file.c_str(), NULL, NULL),
+          std::string("Failed to load DBD file: ")+dbd_file);
+    std::cout<<"dbLoadDatabase(\""<<dbd_file<<"\")\n";
+
     softIoc_registerRecordDeviceDriver(pdbbase);
+    std::cout<<"softIoc_registerRecordDeviceDriver(pdbbase)\n";
     registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine);
+}
 
-    while (argc>1 && **argv == '-') {
-	switch ((*argv)[1]) {
-	case 'a':
-	    if (macros) asSetSubstitutions(macros);
-	    asSetFilename(*++argv);
-	    --argc;
-	    break;
-	
-	case 'd':
-	    if (dbLoadRecords(*++argv, macros)) {
-		epicsExit(EXIT_FAILURE);
-	    }
-	    loadedDb = 1;
-	    --argc;
-	    break;
-	
-	case 'h':
-	    usage(EXIT_SUCCESS);
-	
-	case 'm':
-	    macros = *++argv;
-	    --argc;
-	    break;
-	
-	case 'S':
-	    startIocsh = 0;
-	    break;
-	
-	case 's':
-	    break;
-	
-	case 'x':
-	    epicsSnprintf(xmacro, sizeof xmacro, "IOC=%s", *++argv);
-	    if (dbLoadRecords(exit_db, xmacro)) {
-		epicsExit(EXIT_FAILURE);
-	    }
-	    loadedDb = 1;
-	    --argc;
-	    break;
-	
-	default:
-	    printf("%s: option '%s' not recognized\n", arg0, *argv);
-	    usage(EXIT_FAILURE);
-	}
-	--argc;
-	++argv;
-    }
-    
-    if (argc>0 && **argv=='-') {
-	switch((*argv)[1]) {
-	case 'a':
-	case 'd':
-	case 'm':
-	case 'x':
-	    printf("%s: missing argument to option '%s'\n", arg0, *argv);
-	    usage(EXIT_FAILURE);
-	
-	case 'h':
-	    usage(EXIT_SUCCESS);
-	
-	case 'S':
-	    startIocsh = 0;
-	    break;
-	
-	case 's':
-	    break;
-	
-	default:
-	    printf("%s: option '%s' not recognized\n", arg0, *argv);
-	    usage(EXIT_FAILURE);
-	}
-	--argc;
-	++argv;
-    }
-    
-    if (loadedDb) {
-	iocInit();
-	epicsThreadSleep(0.2);
-    }
-    
-    /* run user's startup script */
-    if (argc>0) {
-	if (iocsh(*argv)) epicsExit(EXIT_FAILURE);
-	epicsThreadSleep(0.2);
-	loadedDb = 1;	/* Give it the benefit of the doubt... */
-    }
-    
-    /* start an interactive shell if it was requested */
-    if (startIocsh) {
-	iocsh(NULL);
-    } else {
-	if (loadedDb) {
-	    epicsThreadExitMain();
-	} else {
-	    printf("%s: Nothing to do!\n", arg0);
-	    usage(EXIT_FAILURE);
-	}
+} // namespace
+
+int main(int argc, char *argv[])
+{
+    try {
+        std::string dbd_file(DBD_FILE),
+                    exit_file(EXIT_FILE),
+                    macros, // scratch space for macros (may be given more than once)
+                    xmacro;
+        bool interactive = true;
+        bool loadedDb = false;
+
+        // attempt to compute relative paths
+        {
+            std::string prefix;
+            char *cprefix = epicsGetExecDir();
+            if(cprefix) {
+                try {
+                    prefix = cprefix;
+                    free(cprefix);
+                } catch(...) {
+                    free(cprefix);
+                    throw;
+                }
+            }
+
+            dbd_file = prefix + DBD_FILE_REL;
+            exit_file = prefix + EXIT_FILE_REL;
+        }
+
+        int opt;
+
+        while ((opt = getopt(argc, argv, "ha:d:m:Ssx:")) != -1) {
+            switch (opt) {
+            case 'h':               /* Print usage */
+                usage(argv[0], dbd_file);
+                epicsExit(0);
+                return 0;
+            default:
+                usage(argv[0], dbd_file);
+                std::cerr<<"Unknown argument: -"<<char(opt)<<"\n";
+                epicsExit(2);
+                return 2;
+            case 'a':
+                lazy_dbd(dbd_file);
+                if (!macros.empty()) {
+                    if(asSetSubstitutions(macros.c_str()))
+                        throw std::bad_alloc();
+                    std::cout<<"asSetSubstitutions(\""<<macros<<"\")\n";
+                }
+                if(asSetFilename(optarg))
+                    throw std::bad_alloc();
+                std::cout<<"asSetFilename(\""<<optarg<<"\")\n";
+                break;
+            case 'd':
+                lazy_dbd(dbd_file);
+                errIf(dbLoadRecords(optarg, macros.c_str()),
+                      std::string("Failed to load: ")+optarg);
+                std::cout<<"dbLoadRecords(\""<<optarg<<"\"";
+                if(!macros.empty())
+                    std::cout<<", \""<<macros<<"\"";
+                std::cout<<")\n";
+                loadedDb = true;
+                break;
+            case 'm':
+                macros = optarg;
+                break;
+            case 'S':
+                interactive = false;
+                break;
+            case 's':
+                break; // historical
+            case 'x':
+                lazy_dbd(dbd_file);
+                xmacro  = "IOC=";
+                xmacro += optarg;
+                errIf(dbLoadRecords(exit_file.c_str(), xmacro.c_str()),
+                      std::string("Failed to load: ")+exit_file);
+                loadedDb = true;
+                break;
+            }
+        }
+
+        lazy_dbd(dbd_file);
+
+        if(optind<argc)  {
+            // run script
+            // ignore any extra positional args (historical)
+
+            std::cout<<"# Begin "<<argv[optind]<<"\n";
+            errIf(iocsh(argv[optind]),
+                        std::string("Error in ")+argv[optind]);
+            std::cout<<"# End "<<argv[optind]<<"\n";
+
+            epicsThreadSleep(0.2);
+            loadedDb = true;	/* Give it the benefit of the doubt... */
+        }
+
+        if (loadedDb) {
+            std::cout<<"iocInit()\n";
+            iocInit();
+            epicsThreadSleep(0.2);
+        }
+
+        if(interactive) {
+            std::cout.flush();
+            std::cerr.flush();
+            if(iocsh(NULL)) {
+                epicsExit(1);
+                return 1;
+            }
+
+        } else {
+            if (loadedDb) {
+                epicsThreadExitMain();
+
+            } else {
+                usage(argv[0], dbd_file);
+                std::cerr<<"Nothing to do!\n";
+                epicsExit(1);
+                return 1;
+            }
+        }
+
+        epicsExit(0);
+        return 0;
+
+    }catch(std::exception& e){
+        std::cerr<<"Error: "<<e.what()<<"\n";
+        epicsExit(2);
+        return 2;
     }
-    epicsExit(EXIT_SUCCESS);
-    /*Note that the following statement will never be executed*/
-    return 0;
 }
diff --git a/modules/libcom/src/misc/unixFileName.h b/modules/libcom/src/misc/unixFileName.h
index 36e818c..9d7af25 100644
--- a/modules/libcom/src/misc/unixFileName.h
+++ b/modules/libcom/src/misc/unixFileName.h
@@ -14,7 +14,29 @@
 #ifndef unixFileNameH
 #define unixFileNameH
 
+#include <shareLib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OSI_PATH_LIST_SEPARATOR ":"
 #define OSI_PATH_SEPARATOR "/"
 
+/** Return the absolute path of the current executable.
+ @returns NULL or the path.  Caller must free()
+ */
+epicsShareFunc
+char *epicsGetExecName(void);
+
+/** Return the absolute path of the directory containing the current executable.
+ @returns NULL or the path.  Caller must free()
+ */
+epicsShareFunc
+char *epicsGetExecDir(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* unixFileNameH */
diff --git a/modules/libcom/src/osi/Makefile b/modules/libcom/src/osi/Makefile
index ecbf4c2..0352e9f 100644
--- a/modules/libcom/src/osi/Makefile
+++ b/modules/libcom/src/osi/Makefile
@@ -123,6 +123,7 @@ Com_SRCS += osdMonotonic.c
 Com_SRCS += osdProcess.c
 Com_SRCS += osdNetIntf.c
 Com_SRCS += osdMessageQueue.c
+Com_SRCS += osdgetexec.c
 
 Com_SRCS += devLibVME.c
 Com_SRCS += devLibVMEOSD.c
diff --git a/modules/libcom/src/osi/os/Darwin/osdgetexec.c b/modules/libcom/src/osi/os/Darwin/osdgetexec.c
 new file mode 100644
index 0000000..4e4961c
--- /dev/null
+++ b/modules/libcom/src/osi/os/Darwin/osdgetexec.c
@@ -0,0 +1,50 @@
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <mach-o/dyld.h>
+
+#define epicsExportSharedSymbols
+#include <osiFileName.h>
+
+char *epicsGetExecName(void)
+{
+    uint32_t max = 64u;
+    char *ret = NULL;
+
+    while(1) {
+        char *temp = realloc(ret, max);
+        if(!temp) {
+            /* we treat alloc failure as terminal */
+            free(ret);
+            ret = NULL;
+            break;
+        }
+        ret = temp;
+
+        /* cf. "man 3 dyld" */
+        if(_NSGetExecutablePath(ret, &max)==0) {
+            /* max left unchanged */
+            ret[max-1] = '\0';
+            break;
+        }
+        /* max has been updated with required size */
+    }
+
+    /* TODO: _NSGetExecutablePath() doesn't follow symlinks */
+
+    return ret;
+}
+
+char *epicsGetExecDir(void)
+{
+    char *ret = epicsGetExecName();
+    if(ret) {
+        char *sep = strrchr(ret, '/');
+        if(sep) {
+            /* nil the charactor after the / */
+            sep[1] = '\0';
+        }
+    }
+    return ret;
+}
diff --git a/modules/libcom/src/osi/os/Linux/osdgetexec.c b/modules/libcom/src/osi/os/Linux/osdgetexec.c
 new file mode 100644
index 0000000..cba5d78
--- /dev/null
+++ b/modules/libcom/src/osi/os/Linux/osdgetexec.c
@@ -0,0 +1,54 @@
+
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <limits.h>
+
+#define epicsExportSharedSymbols
+#include <osiFileName.h>
+
+char *epicsGetExecName(void)
+{
+    size_t max = PATH_MAX;
+    char *ret = NULL;
+    ssize_t n;
+
+    while(1) {
+        char *temp = realloc(ret, max);
+        if(!temp) {
+            /* we treat alloc failure as terminal */
+            free(ret);
+            ret = NULL;
+            break;
+        }
+        ret = temp;
+
+        n = readlink("/proc/self/exe", ret, max);
+        if(n == -1) {
+            free(ret);
+            ret = NULL;
+            break;
+        } else if(n < max) {
+            /* readlink() never adds a nil */
+            ret[n] = '\0';
+            break;
+        }
+
+        max += 64;
+    }
+
+    return ret;
+}
+
+char *epicsGetExecDir(void)
+{
+    char *ret = epicsGetExecName();
+    if(ret) {
+        char *sep = strrchr(ret, '/');
+        if(sep) {
+            /* nil the charactor after the / */
+            sep[1] = '\0';
+        }
+    }
+    return ret;
+}
diff --git a/modules/libcom/src/osi/os/WIN32/osdgetexec.c b/modules/libcom/src/osi/os/WIN32/osdgetexec.c
 new file mode 100644
index 0000000..a46ce50
--- /dev/null
+++ b/modules/libcom/src/osi/os/WIN32/osdgetexec.c
@@ -0,0 +1,52 @@
+
+#include <string.h>
+#include <stdlib.h>
+#include <windows.h>
+
+#define epicsExportSharedSymbols
+#include <osiFileName.h>
+
+char *epicsGetExecName(void)
+{
+    size_t max = 128;
+    char *ret = NULL;
+    DWORD n;
+
+    while(1) {
+        char *temp = realloc(ret, max);
+        if(!temp) {
+            /* we treat alloc failure as terminal */
+            free(ret);
+            ret = NULL;
+            break;
+        }
+        ret = temp;
+
+        n = GetModuleFileName(NULL, ret, max);
+        if(n == 0) {
+            free(ret);
+            ret = NULL;
+            break;
+        } else if(n < max) {
+            ret[n] = '\0';
+            break;
+        }
+
+        max += 64;
+    }
+
+    return ret;
+}
+
+char *epicsGetExecDir(void)
+{
+    char *ret = epicsGetExecName();
+    if(ret) {
+        char *sep = strrchr(ret, '\\');
+        if(sep) {
+            /* nil the charactor after the / */
+            sep[1] = '\0';
+        }
+    }
+    return ret;
+}
diff --git a/modules/libcom/src/osi/os/WIN32/osiFileName.h b/modules/libcom/src/osi/os/WIN32/osiFileName.h
index 6ff0308..ced745f 100644
--- a/modules/libcom/src/osi/os/WIN32/osiFileName.h
+++ b/modules/libcom/src/osi/os/WIN32/osiFileName.h
@@ -15,7 +15,29 @@
 #ifndef osiFileNameH
 #define osiFileNameH
 
+#include <shareLib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OSI_PATH_LIST_SEPARATOR ";"
 #define OSI_PATH_SEPARATOR "\\"
 
+/** Return the absolute path of the current executable.
+ @returns NULL or the path.  Caller must free()
+ */
+epicsShareFunc
+char *epicsGetExecName(void);
+
+/** Return the absolute path of the directory containing the current executable.
+ @returns NULL or the path.  Caller must free()
+ */
+epicsShareFunc
+char *epicsGetExecDir(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* osiFileNameH */
diff --git a/modules/libcom/src/osi/os/cygwin32/osiFileName.h b/modules/libcom/src/osi/os/cygwin32/osiFileName.h
index 6d7fd6e..1e77990 100644
--- a/modules/libcom/src/osi/os/cygwin32/osiFileName.h
+++ b/modules/libcom/src/osi/os/cygwin32/osiFileName.h
@@ -14,7 +14,29 @@
 #ifndef osiFileNameH
 #define osiFileNameH
 
+#include <shareLib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OSI_PATH_LIST_SEPARATOR ";"
 #define OSI_PATH_SEPARATOR "\\"
 
+/** Return the absolute path of the current executable.
+ @returns NULL or the path.  Caller must free()
+ */
+epicsShareFunc
+char *epicsGetExecName(void);
+
+/** Return the absolute path of the directory containing the current executable.
+ @returns NULL or the path.  Caller must free()
+ */
+epicsShareFunc
+char *epicsGetExecDir(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* osiFileNameH */
diff --git a/modules/libcom/src/osi/os/default/osdgetexec.c b/modules/libcom/src/osi/os/default/osdgetexec.c
 new file mode 100644
index 0000000..0bec9ea
--- /dev/null
+++ b/modules/libcom/src/osi/os/default/osdgetexec.c
@@ -0,0 +1,14 @@
+#include <stdlib.h>
+
+#define epicsExportSharedSymbols
+#include <osiFileName.h>
+
+char *epicsGetExecName(void)
+{
+    return NULL;
+}
+
+char *epicsGetExecDir(void)
+{
+    return NULL;
+}
diff --git a/modules/libcom/src/osi/os/freebsd/osdgetexec.c b/modules/libcom/src/osi/os/freebsd/osdgetexec.c
 new file mode 100644
index 0000000..39c0a16
--- /dev/null
+++ b/modules/libcom/src/osi/os/freebsd/osdgetexec.c
@@ -0,0 +1,68 @@
+
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <limits.h>
+
+#define epicsExportSharedSymbols
+#include <osiFileName.h>
+
+char *epicsGetExecName(void)
+{
+    size_t max = PATH_MAX;
+    char *ret = NULL;
+    ssize_t n;
+
+    while(1) {
+        char *temp = realloc(ret, max);
+        if(!temp) {
+            /* we treat alloc failure as terminal */
+            free(ret);
+            ret = NULL;
+            break;
+        }
+        ret = temp;
+
+        n = readlink("/proc/curproc/file", ret, max);
+        if(n == -1) {
+            free(ret);
+            ret = NULL;
+            break;
+        } else if(n < max) {
+            /* readlink() never adds a nil */
+            ret[n] = '\0';
+            break;
+        }
+
+        max += 64;
+    }
+
+    if(!ret) {
+        int mib[4];
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_PATHNAME;
+        mib[3] = -1;
+
+        ret = malloc(max);
+        if(ret) {
+            sysctl(mib, 4, ret, &cb, NULL, 0);
+            /* TODO: error check */
+        }
+    }
+
+    return ret;
+}
+
+char *epicsGetExecDir(void)
+{
+    char *ret = epicsGetExecName();
+    if(ret) {
+        char *sep = strrchr(ret, '/');
+        if(sep) {
+            /* nil the charactor after the / */
+            sep[1] = '\0';
+        }
+    }
+    return ret;
+}
diff --git a/modules/libcom/src/osi/os/solaris/osdgetexec.c b/modules/libcom/src/osi/os/solaris/osdgetexec.c
 new file mode 100644
index 0000000..ff9739c
--- /dev/null
+++ b/modules/libcom/src/osi/os/solaris/osdgetexec.c
@@ -0,0 +1,30 @@
+
+#include <string.h>
+#include <stdlib.h>
+
+#define epicsExportSharedSymbols
+#include <osiFileName.h>
+
+char *epicsGetExecName(void)
+{
+    const char *raw = getexecname();
+    char *ret = NULL;
+    /* manpage says getexecname() might return a relative path.  we treat this as an error */
+    if(raw[0]=='/') {
+        ret = strdup(raw);
+    }
+    return ret;
+}
+
+char *epicsGetExecDir(void)
+{
+    char *ret = epicsGetExecName();
+    if(ret) {
+        char *sep = strrchr(ret, '/');
+        if(sep) {
+            /* nil the charactor after the / */
+            sep[1] = '\0';
+        }
+    }
+    return ret;
+}
diff --git a/modules/libcom/test/Makefile b/modules/libcom/test/Makefile
index f2e495a..4a5e457 100755
--- a/modules/libcom/test/Makefile
+++ b/modules/libcom/test/Makefile
@@ -232,6 +232,11 @@ osiSockTest_SRCS += osiSockTest.c
 testHarness_SRCS += osiSockTest.c
 TESTS += osiSockTest
 
+TESTPROD_HOST += testexecname
+testexecname_SRCS += testexecname.c
+# no point in including in testHarness.  Not implemented for RTEMS/vxWorks.
+TESTS += testexecname
+
 ifeq ($(BUILD_CLASS),HOST)
 ifneq ($(OS_CLASS),WIN32)
 # This test can only be run on a build host, and is broken on Windows
diff --git a/modules/libcom/test/testexecname.c b/modules/libcom/test/testexecname.c
 new file mode 100644
index 0000000..87be847
--- /dev/null
+++ b/modules/libcom/test/testexecname.c
@@ -0,0 +1,24 @@
+
+#include <string.h>
+
+#include <epicsUnitTest.h>
+#include <testMain.h>
+
+#include <osiFileName.h>
+
+MAIN(testexecname)
+{
+    testPlan(1);
+
+    {
+        char *buf = epicsGetExecName();
+        if(!buf) {
+            testSkip(1, "epicsGetExecName() not available for this target");
+        } else {
+            char *loc = strstr(buf, "testexecname");
+            testOk(!!loc, "Find \"testexecname\" in \"%s\"", buf);
+        }
+    }
+
+    return testDone();
+}
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 0df1797..0d0c011 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -39,6 +39,8 @@ PERL_SCRIPTS += tap-to-junit-xml.pl
 PERL_SCRIPTS += useManifestTool.pl
 PERL_SCRIPTS += genVersionHeader.pl
 
+PERL_SCRIPTS += makeRPath.py
+
 HTMLS = style.css
 HTMLS += EPICS/Getopts.html
 HTMLS += EPICS/Path.html
diff --git a/src/tools/makeRPath.py b/src/tools/makeRPath.py
 new file mode 100644
index 0000000..000b8b4
--- /dev/null
+++ b/src/tools/makeRPath.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+import sys
+import os
+from collections import OrderedDict # used as OrderedSet
+
+from argparse import ArgumentParser
+
+if os.environ.get('EPICS_DEBUG_RPATH','')=='YES':
+    sys.stderr.write('%s'%sys.argv)
+
+P = ArgumentParser(description='''Compute and output -rpath entries for each of the given paths.
+  Paths under --root will be computed as relative to --final .''',
+epilog='''
+eg. A library to be placed in /build/lib and linked against libraries in
+'/build/lib', '/build/module/lib', and '/other/lib' would pass:
+
+ "makeRPath.py -F /build/lib -R /build /build/lib /build/module/lib /other/lib"
+which prints "-Wl,-rpath,$ORIGIN/. -Wl,-rpath,$ORIGIN/../module/lib -Wl,-rpath,/other/lib"
+''')
+P.add_argument('-F','--final',default=os.getcwd(), help='Final install location for ELF file')
+P.add_argument('-R','--root',default='', help='Root(s) of relocatable tree.  Separate with :')
+P.add_argument('-O', '--origin', default='$ORIGIN')
+P.add_argument('path', nargs='*')
+args = P.parse_args()
+
+# eg.
+# target to be installed as: /build/bin/blah
+#
+# post-install will copy as:  /install/bin/blah
+#
+# Need to link against:
+#   /install/lib/libA.so
+#   /build/lib/libB.so
+#   /other/lib/libC.so
+#
+# Want final result to be:
+#  -rpath $ORIGIN/../lib -rpath /other/lib \
+#  -rpath-link /build/lib -rpath-link /install/lib
+
+fdir = os.path.abspath(args.final)
+roots = [os.path.abspath(root) for root in args.root.split(':') if len(root)]
+
+# find the root which contains the final location
+froot = None
+for root in roots:
+    frel = os.path.relpath(fdir, root)
+    if not frel.startswith('..'):
+        # final dir is under this root
+        froot = root
+        break
+
+if froot is None:
+    sys.stderr.write("makeRPath: Final location %s\nNot under any of: %s\n"%(fdir, roots))
+    sys.exit(1)
+
+output = OrderedDict()
+for path in args.path:
+    path = os.path.abspath(path)
+
+    for root in roots:
+        rrel = os.path.relpath(path, root)
+        if not rrel.startswith('..'):
+            # path is under this root
+
+            # some older binutils don't seem to handle $ORIGIN correctly
+            # when locating dependencies of libraries.  So also provide
+            # the absolute path for internal use by 'ld' only.
+            output['-Wl,-rpath-link,'+path] = True
+
+            # frel is final location relative to enclosing root
+            # rrel is target location relative to enclosing root
+            path = os.path.relpath(rrel, frel)
+            break
+
+    output['-Wl,-rpath,'+os.path.join(args.origin, path)] = True
+
+print(' '.join(output))