From b57edb89eb936d93bd4859d15c0d83f53566c29c Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Sat, 21 May 2022 13:18:04 +0100
Subject: [PATCH] Unify abi for wasm32 and the future wasm64

---
 src/llvm_abi.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/llvm_abi.cpp b/src/llvm_abi.cpp
index f4ee46386..60a07e531 100644
--- a/src/llvm_abi.cpp
+++ b/src/llvm_abi.cpp
@@ -1056,7 +1056,7 @@ namespace lbAbiArm64 {
 	}
 }
 
-namespace lbAbiWasm32 {
+namespace lbAbiWasm {
 	/*
 		NOTE(bill): All of this is custom since there is not an "official"
 		            ABI definition for WASM, especially for Odin.
@@ -1312,13 +1312,8 @@ LB_ABI_INFO(lb_get_abi_info) {
 	case TargetArch_arm64:
 		return lbAbiArm64::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention);
 	case TargetArch_wasm32:
-		// TODO(bill): implement wasm32's ABI correct 
-		// NOTE(bill): this ABI is only an issue for WASI compatibility
-		return lbAbiWasm32::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention);
 	case TargetArch_wasm64:
-		// TODO(bill): implement wasm64's ABI correct 
-		// NOTE(bill): this ABI is only an issue for WASI compatibility
-		return lbAbiAmd64SysV::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention);
+		return lbAbiWasm::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention);
 	}
 
 	GB_PANIC("Unsupported ABI");