Rename cmitls.c to cmitls.C 73/4973/5
authorEvan Ramos <evan@hpccharm.com>
Fri, 22 Feb 2019 19:57:59 +0000 (13:57 -0600)
committerEvan Ramos <evan@hpccharm.com>
Thu, 28 Feb 2019 23:07:33 +0000 (17:07 -0600)
Change-Id: I7e41a7ecb89212afea0a6f227295542ca14940b5

src/scripts/Make.depends
src/util/cmitls.C [moved from src/util/cmitls.c with 99% similarity]
src/util/cmitls.h

index 2e2617b..ccedc27 100644 (file)
@@ -2356,7 +2356,7 @@ cmirdmautils.o: cmirdmautils.c cmirdmautils.h conv-header.h conv-config.h \
  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
  conv-trace.h persistent.h conv-rdma.h debug-conv.h
 
-cmitls.o: cmitls.c converse.h conv-header.h conv-config.h \
+cmitls.o: cmitls.C converse.h conv-header.h conv-config.h \
  conv-autoconfig.h conv-common.h conv-mach-common.h conv-mach.h \
  conv-mach-opt.h lrts-common.h cmiqueue.h pup_c.h lrtslock.h queueing.h \
  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
similarity index 99%
rename from src/util/cmitls.c
rename to src/util/cmitls.C
index 84f75b5..eed5838 100644 (file)
  * Of note are sections 3.4.2 (IA-32, a.k.a. x86) and 3.4.6 (x86-64).
  */
 
+extern "C" {
 void* getTLS(void) CMI_NOOPTIMIZE;
 void setTLS(void* newptr) CMI_NOOPTIMIZE;
 void* swapTLS(void* newptr) CMI_NOOPTIMIZE;
+}
 
 CMI_EXTERNC_VARIABLE int quietModeRequested;
 
@@ -154,8 +156,10 @@ void allocNewTLSSeg(tlsseg_t* t, CthThread th) {
   }
 }
 
+extern "C" {
 void switchTLS(tlsseg_t* , tlsseg_t* ) CMI_NOOPTIMIZE;
 void currentTLS(tlsseg_t*) CMI_NOOPTIMIZE;
+}
 
 void currentTLS(tlsseg_t* cur) {
   cur->memseg = (Addr)getTLS();
index 59bb882..3e28827 100644 (file)
@@ -42,9 +42,17 @@ typedef int  tlsseg_t;            /* place holder */
 
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void CmiTLSInit(void);
 void allocNewTLSSeg(tlsseg_t* t, CthThread th);
 void switchTLS(tlsseg_t*, tlsseg_t*);
 void currentTLS(tlsseg_t*);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif