commit ede231d349e048cf2971d1efe4d73f62325ebfe2
author Sam Clegg <sbc@chromium.org> Fri May 01 17:41:52 2020
committer GitHub <noreply@github.com> Fri May 01 17:41:52 2020
tree 8a81f6a4b6ebe1e8934674ac5aa9c143e88a7033
parent d421109a0735e359bc4ec37d55d795348becd8d1

Export named globals even in non-relocatable code (#269)

This allows native code to export the address of globals using
the normal EMSCRIPTEN_KEEPALIVE mechanism.

lib/Target/JSBackend/JSBackend.cpp

diff --git a/lib/Target/JSBackend/JSBackend.cpp b/lib/Target/JSBackend/JSBackend.cpp
index c41757c..2606281 100644
--- a/lib/Target/JSBackend/JSBackend.cpp
+++ b/lib/Target/JSBackend/JSBackend.cpp
@@ -3695,17 +3695,15 @@
       parseConstant(I->getName().str(), I->getInitializer(), I->getAlignment(), false);
     }
   }
-  if (Relocatable) {
-    for (Module::const_global_iterator II = TheModule->global_begin(),
-           E = TheModule->global_end(); II != E; ++II) {
-      auto I = &*II;
-      if (I->hasInitializer() && !I->hasInternalLinkage()) {
-        std::string Name = I->getName().str();
-        if (GlobalAddresses.find(Name) != GlobalAddresses.end()) {
-          std::string JSName = getJSName(I).substr(1);
-          if (Name == JSName) { // don't export things that have weird internal names, that C can't dlsym anyhow
-            NamedGlobals[Name] = getGlobalAddress(Name);
-          }
+  for (Module::const_global_iterator II = TheModule->global_begin(),
+         E = TheModule->global_end(); II != E; ++II) {
+    auto I = &*II;
+    if (I->hasInitializer() && !I->hasInternalLinkage()) {
+      std::string Name = I->getName().str();
+      if (GlobalAddresses.find(Name) != GlobalAddresses.end()) {
+        std::string JSName = getJSName(I).substr(1);
+        if (Name == JSName) { // don't export things that have weird internal names, that C can't dlsym anyhow
+          NamedGlobals[Name] = getGlobalAddress(Name);
         }
       }
     }