From dfe7c0d764a953e079cb35b62d2907bccb4b8c19 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Wed, 20 Nov 2019 13:27:18 +0100 Subject: [PATCH 1/3] fix(runtime-c-api) Add support for GNUC when defining `ARCH_X86_64`. `ARCH_X86_64` is correctly defined for GCC or clang, but gnuc was missing. This patch fixes that. --- lib/runtime-c-api/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-c-api/build.rs b/lib/runtime-c-api/build.rs index 7750b0081..5897001b0 100644 --- a/lib/runtime-c-api/build.rs +++ b/lib/runtime-c-api/build.rs @@ -22,7 +22,7 @@ fn main() { #endif #endif -#if defined(GCC) || defined(__clang__) +#if defined(GCC) || defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) #define ARCH_X86_64 #endif From 9468e229f4f2c968955c16c0eb6fa016b0f19154 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Wed, 20 Nov 2019 13:30:02 +0100 Subject: [PATCH 2/3] chore(runtime-c-api) Update header files. --- lib/runtime-c-api/wasmer.h | 2 +- lib/runtime-c-api/wasmer.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/runtime-c-api/wasmer.h b/lib/runtime-c-api/wasmer.h index 836a41df2..40a265cff 100644 --- a/lib/runtime-c-api/wasmer.h +++ b/lib/runtime-c-api/wasmer.h @@ -8,7 +8,7 @@ #endif #endif -#if defined(GCC) || defined(__clang__) +#if defined(GCC) || defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) #define ARCH_X86_64 #endif diff --git a/lib/runtime-c-api/wasmer.hh b/lib/runtime-c-api/wasmer.hh index 79c350d60..b437edd4b 100644 --- a/lib/runtime-c-api/wasmer.hh +++ b/lib/runtime-c-api/wasmer.hh @@ -8,7 +8,7 @@ #endif #endif -#if defined(GCC) || defined(__clang__) +#if defined(GCC) || defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) #define ARCH_X86_64 #endif From 6ba3d1c5bc47bbba8303cd22039ce810f85c0a26 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Wed, 20 Nov 2019 13:32:31 +0100 Subject: [PATCH 3/3] doc(changelog) Add #987. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ed6bfc74..40a600caf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## **[Unreleased]** +- [#987](https://github.com/wasmerio/wasmer/pull/987) Fix `runtime-c-api` header files when compiled by gnuc. + ## 0.10.2 - 2019-11-18 - [#968](https://github.com/wasmerio/wasmer/pull/968) Added `--invoke` option to the command