Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(runtime-c-api) Add support for clang in WASMER_H_MACROS #960

Merged
merged 9 commits into from
Nov 14, 2019
Merged

feat(runtime-c-api) Add support for clang in WASMER_H_MACROS #960

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
645519c
fix(runtime-c-api) Use `#if defined` instead of `#ifdef`.
Hywan Nov 13, 2019
b081d17
feat(runtime-c-api) Add support for clang in `WASMER_H_MACROS`.
Hywan Nov 13, 2019
be9d7f2
chore(runtime-c-api) Update header files.
Hywan Nov 13, 2019
938dedb
doc(changelog) Add #960.
Hywan Nov 13, 2019
4e4663c
Merge branch 'master' into fix-runtime-c-api-header-preprocessor-clang
Hywan Nov 13, 2019
42b02be
fix(runtime-c-api) Write macros at column 0.
Hywan Nov 14, 2019
987b076
chore(runtime-c-api) Update header files.
Hywan Nov 14, 2019
c43a7c7
Merge branch 'master' into fix-runtime-c-api-header-preprocessor-clang
Hywan Nov 14, 2019
074a8f9
Merge branch 'fix-runtime-c-api-header-preprocessor-clang' of github.…
Hywan Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## **[Unreleased]**

- [#960](https://github.com/wasmerio/wasmer/pull/960) Fix `runtime-c-api` header files when compiled by clang.
- [#925](https://github.com/wasmerio/wasmer/pull/925) Host functions can be closures with a captured environment.
- [#917](https://github.com/wasmerio/wasmer/pull/917) Host functions (aka imported functions) may not have `&mut vm::Ctx` as first argument, i.e. the presence of the `&mut vm::Ctx` argument is optional.
- [#915](https://github.com/wasmerio/wasmer/pull/915) All backends share the same definition of `Trampoline` (defined in `wasmer-runtime-core`).
Expand Down
24 changes: 12 additions & 12 deletions lib/runtime-c-api/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ fn main() {
out_wasmer_header_file.push("wasmer");

const WASMER_PRE_HEADER: &str = r#"
#ifndef WASMER_H_MACROS
#define WASMER_H_MACROS
#if MSVC
#ifdef _M_AMD64
#define ARCH_X86_64
#endif
#endif
#if !defined(WASMER_H_MACROS)
#define WASMER_H_MACROS
#if defined(MSVC)
#if defined(_M_AMD64)
#define ARCH_X86_64
#endif
#endif

#if GCC
#ifdef __x86_64__
#define ARCH_X86_64
#endif
#if defined(GCC) || defined(__clang__)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug fix is here: defined(__clang__).

#if defined(__x86_64__)
#define ARCH_X86_64
#endif
#endif
#endif
#endif // WASMER_H_MACROS
"#;
// Generate the C bindings in the `OUT_DIR`.
out_wasmer_header_file.set_extension("h");
Expand Down
26 changes: 13 additions & 13 deletions lib/runtime-c-api/wasmer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

#ifndef WASMER_H_MACROS
#define WASMER_H_MACROS
#if MSVC
#ifdef _M_AMD64
#define ARCH_X86_64
#if !defined(WASMER_H_MACROS)
#define WASMER_H_MACROS
#if defined(MSVC)
#if defined(_M_AMD64)
#define ARCH_X86_64
#endif
#endif

#if defined(GCC) || defined(__clang__)
#if defined(__x86_64__)
#define ARCH_X86_64
#endif
#endif
#endif
#endif

#if GCC
#ifdef __x86_64__
#define ARCH_X86_64
#endif
#endif
#endif // WASMER_H_MACROS


#ifndef WASMER_H
Expand Down
26 changes: 13 additions & 13 deletions lib/runtime-c-api/wasmer.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

#ifndef WASMER_H_MACROS
#define WASMER_H_MACROS
#if MSVC
#ifdef _M_AMD64
#define ARCH_X86_64
#if !defined(WASMER_H_MACROS)
#define WASMER_H_MACROS
#if defined(MSVC)
#if defined(_M_AMD64)
#define ARCH_X86_64
#endif
#endif

#if defined(GCC) || defined(__clang__)
#if defined(__x86_64__)
#define ARCH_X86_64
#endif
#endif
#endif
#endif

#if GCC
#ifdef __x86_64__
#define ARCH_X86_64
#endif
#endif
#endif // WASMER_H_MACROS


#ifndef WASMER_H
Expand Down