1 files changed, 22 insertions, 2 deletions
diff --git a/src/modules.js b/src/modules.js
index b9b8ab5e..e2d3433f 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -284,8 +284,8 @@ var Functions = {
         var chunks = getNumIntChunks(type);
         if (chunks > 0) {
           for (var j = 0; j < chunks; j++) sig += 'i';
-        } else {
-          // some special type like a SIMD vector
+        } else if (type !== '...') {
+          // some special type like a SIMD vector (anything but varargs, which we handle below)
           sig += Functions.getSignatureLetter(type);
         }
       }
@@ -429,6 +429,26 @@ var LibraryManager = {
       eval(processMacros(preprocess(read(libraries[i]))));
     }
 
+    /*
+    // export code for CallHandlers.h
+    printErr('============================');
+    for (var x in this.library) {
+      var y = this.library[x];
+      if (typeof y === 'string' && x.indexOf('__sig') < 0 && x.indexOf('__postset') < 0 && y.indexOf(' ') < 0) {
+        printErr('DEF_REDIRECT_HANDLER(' + x + ', ' + y + ');');
+      }
+    }
+    printErr('============================');
+    for (var x in this.library) {
+      var y = this.library[x];
+      if (typeof y === 'string' && x.indexOf('__sig') < 0 && x.indexOf('__postset') < 0 && y.indexOf(' ') < 0) {
+        printErr('  SETUP_CALL_HANDLER(' + x + ');');
+      }
+    }
+    printErr('============================');
+    // end export code for CallHandlers.h
+    */
+
     this.loaded = true;
   },