diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-10-14 15:32:50 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-10-24 14:52:13 +0200 |
| commit | 942aea230f5e517d5add194240c8943f28d79943 (patch) | |
| tree | ef4af65b83d089b084e8d051c53e46f0e47850fe /docs/markdown | |
| parent | e04bce3f0453fc73c2170cfbf2f51debe2fc33c3 (diff) | |
| download | meson-942aea230f5e517d5add194240c8943f28d79943.zip meson-942aea230f5e517d5add194240c8943f28d79943.tar.gz meson-942aea230f5e517d5add194240c8943f28d79943.tar.bz2 | |
Add MASM compiler
ml and armasm are Microsoft's Macro Assembler, part of MSVC.
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Reference-tables.md | 5 | ||||
| -rw-r--r-- | docs/markdown/snippets/asm.md | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md index 7e0cf42..fde816d 100644 --- a/docs/markdown/Reference-tables.md +++ b/docs/markdown/Reference-tables.md @@ -38,6 +38,8 @@ These are return values of the `get_id` (Compiler family) and | cython | The Cython compiler | | | nasm | The NASM compiler (Since 0.64.0) | | | yasm | The YASM compiler (Since 0.64.0) | | +| ml | Microsoft Macro Assembler for x86 and x86_64 (Since 0.64.0) | msvc | +| armasm | Microsoft Macro Assembler for ARM and AARCH64 (Since 0.64.0) | | ## Linker ids @@ -169,7 +171,8 @@ These are the parameter names for passing language specific arguments to your bu | Rust | rust_args | rust_link_args | | Vala | vala_args | vala_link_args | | Cython | cython_args | cython_link_args | -| NASM | nasm_args | | +| NASM | nasm_args | N/A | +| MASM | masm_args | N/A | All these `<lang>_*` options are specified per machine. See in [specifying options per diff --git a/docs/markdown/snippets/asm.md b/docs/markdown/snippets/asm.md index a68f163..1055b53 100644 --- a/docs/markdown/snippets/asm.md +++ b/docs/markdown/snippets/asm.md @@ -1,11 +1,15 @@ -## New language `nasm` +## New languages: `nasm` and `masm` When the `nasm` language is added to the project, `.asm` files are automatically compiled with NASM. This is only supported for x86 and x86_64 CPU family. `yasm` is used as fallback if `nasm` command is not found. -Note that GNU Assembly files usually have `.s` extension and were already built -using C compiler such as GCC or CLANG. +When the `masm` language is added to the project, `.masm` files are +automatically compiled with Microsoft's Macro Assembler. This is only supported +for x86, x86_64, ARM and AARCH64 CPU families. + +Note that GNU Assembly files usually have `.s` or `.S` extension and were already +built using C compiler such as GCC or CLANG. ```meson project('test', 'nasm') |