Implement support for multiple commands in one native executable

lib/cli/src/c_gen/staticlib_header.rs

@@ -72,13 +72,11 @@ fn gen_helper_functions(atom_name: &str, module_name: &str) -> String {
 
 /// Generate the header file that goes with the generated object file.
 pub fn generate_header_file(
-    metadata_prefix: &str,
+    atom_name: &str,
     module_info: &ModuleInfo,
     symbol_registry: &dyn SymbolRegistry,
     metadata_length: usize,
 ) -> String {
-    let module_name = format!("WASMER_METADATA_{}", metadata_prefix.to_uppercase());
-    let atom_name = metadata_prefix;
     let mut c_statements = vec![
         CStatement::LiteralConstant {
             value: "#include \"wasmer.h\"\n#include <stdlib.h>\n#include <string.h>\n\n"
@@ -97,7 +95,7 @@ pub fn generate_header_file(
             })),
         },
         CStatement::Declaration {
-            name: module_name.to_string(),
+            name: symbol_registry.symbol_to_name(Symbol::Metadata),
             is_extern: true,
             is_const: true,
             ctype: CType::Array {
@@ -292,7 +290,7 @@ pub fn generate_header_file(
     }
 
     c_statements.push(CStatement::LiteralConstant {
-        value: gen_helper_functions(atom_name, &module_name),
+        value: gen_helper_functions(atom_name, &symbol_registry.symbol_to_name(Symbol::Metadata)),
     });
 
     c_statements.push(CStatement::LiteralConstant {

lib/cli/src/commands/create_exe.rs

@@ -12,7 +12,8 @@ use std::process::Command;
 use std::process::Stdio;
 use wasmer::*;
 use wasmer_object::{emit_serialized, get_object_for_target};
-use wasmer_types::ModuleInfo;
+use wasmer_types::compilation::symbols::ModuleMetadataSymbolRegistry;
+use wasmer_types::{ModuleInfo, SymbolRegistry};
 use webc::{ParseOptions, WebCMmap};
 
 const LINK_SYSTEM_LIBRARIES_WINDOWS: &[&str] = &["userenv", "Ws2_32", "advapi32", "bcrypt"];
@@ -767,7 +768,10 @@ fn compile_atoms(
                 writer.flush()?;
             }
             ObjectFormat::Serialized => {
-                let module_name = format!("WASMER_METADATA_{}", prefix.to_uppercase());
+                let module_name = ModuleMetadataSymbolRegistry {
+                    prefix: prefix.clone(),
+                }
+                .symbol_to_name(wasmer_types::Symbol::Metadata);
                 let module = Module::from_binary(&store, data).context("failed to compile Wasm")?;
                 let bytes = module.serialize()?;
                 let mut obj = get_object_for_target(target.triple())?;
@@ -991,7 +995,6 @@ pub(crate) fn create_header_files_in_dir(
     prefixes: &[String],
 ) -> anyhow::Result<()> {
     use object::{Object, ObjectSection};
-    use wasmer_types::compilation::symbols::ModuleMetadataSymbolRegistry;
 
     if entrypoint.object_format == ObjectFormat::Serialized {
         write_entrypoint(directory, entrypoint)?;
@@ -1404,7 +1407,11 @@ fn generate_wasmer_main_c(
                 )
             })?;
         let atom_name = prefix.clone();
-        let module_name = format!("WASMER_METADATA_{}", prefix.to_uppercase());
+
+        let module_name = ModuleMetadataSymbolRegistry {
+            prefix: prefix.clone(),
+        }
+        .symbol_to_name(wasmer_types::Symbol::Metadata);
 
         if compile_static {
             extra_headers.push(format!("#include \"static_defs_{atom_name}.h\""));

lib/compiler/src/engine/artifact.rs

@@ -571,7 +571,7 @@ impl Artifact {
         let mut obj = get_object_for_target(target_triple).map_err(to_compile_error)?;
 
         let object_name = format!(
-            "WASMER_METADATA_{}",
+            "WASMER_{}_METADATA",
             metadata_prefix.unwrap_or_default().to_uppercase()
         );
         emit_data(&mut obj, object_name.as_bytes(), &metadata_binary, 1)