From cee70148b34e5b7f859eb8aebf01a301402d0442 Mon Sep 17 00:00:00 2001
From: Evan Ramos <evan@hpccharm.com>
Date: Tue, 23 Apr 2019 11:40:41 -0500
Subject: [PATCH] Fix linking failures in interop changes

Change-Id: I42dc792c2b1e143301af6e9b79fe6eb6d20f311a
---
 src/arch/uth/machine.C              | 4 ++++
 src/arch/util/machine-common-core.C | 1 -
 src/ck-core/mpi-interoperate.C      | 6 +-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/arch/uth/machine.C b/src/arch/uth/machine.C
index c25ec4ae08..f9f8fedc1d 100644
--- a/src/arch/uth/machine.C
+++ b/src/arch/uth/machine.C
@@ -7,6 +7,10 @@
 #include <stdio.h>
 #include <math.h>
 #include "converse.h"
+#include <atomic>
+
+int               userDrivenMode; /* Set by CharmInit for interop in user driven mode */
+std::atomic<int> ckExitComplete {0};
 
 CMI_EXTERNC
 void CthInit(char **);
diff --git a/src/arch/util/machine-common-core.C b/src/arch/util/machine-common-core.C
index 07e1262fbb..9248efbf43 100644
--- a/src/arch/util/machine-common-core.C
+++ b/src/arch/util/machine-common-core.C
@@ -162,7 +162,6 @@ int               _Cmi_mynodesize;/* Number of processors in my address space */
 int               _Cmi_mynode;    /* Which address space am I */
 int               _Cmi_numnodes;  /* Total number of address spaces */
 int               _Cmi_numpes;    /* Total number of processors */
-CMI_EXTERNC_VARIABLE int userDrivenMode;
 int               userDrivenMode; /* Set by CharmInit for interop in user driven mode */
 extern int CharmLibInterOperate;
 
diff --git a/src/ck-core/mpi-interoperate.C b/src/ck-core/mpi-interoperate.C
index bd88ea3b67..16412d5496 100644
--- a/src/ck-core/mpi-interoperate.C
+++ b/src/ck-core/mpi-interoperate.C
@@ -18,11 +18,7 @@ extern MPI_Comm charmComm;
 typedef int MPI_Comm;
 #endif
 
-#if CMK_USE_LRTS
 extern void LrtsDrainResources(); /* used when exit */
-#else
-void LrtsDrainResources() { }
-#endif
 
 extern bool _ringexit;		    // for charm exit
 extern int _ringtoken;
@@ -30,7 +26,7 @@ extern void _initCharm(int unused_argc, char **argv);
 extern void _sendReadonlies();
 extern "C" void CommunicationServerThread(int sleepTime);
 extern int CharmLibInterOperate;
-CMI_EXTERNC_VARIABLE int userDrivenMode;
+extern int userDrivenMode;
 
 extern "C" void StartInteropScheduler();
 extern "C" void StopInteropScheduler();
-- 
2.11.4.GIT