summaryrefslogtreecommitdiff
path: root/docs/markdown/Reference-tables.md
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2022-10-14 15:32:50 -0400
committerXavier Claessens <xclaesse@gmail.com>2022-10-24 14:52:13 +0200
commit942aea230f5e517d5add194240c8943f28d79943 (patch)
treeef4af65b83d089b084e8d051c53e46f0e47850fe /docs/markdown/Reference-tables.md
parente04bce3f0453fc73c2170cfbf2f51debe2fc33c3 (diff)
downloadmeson-942aea230f5e517d5add194240c8943f28d79943.tar.gz
Add MASM compiler
ml and armasm are Microsoft's Macro Assembler, part of MSVC.
Diffstat (limited to 'docs/markdown/Reference-tables.md')
-rw-r--r--docs/markdown/Reference-tables.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index 7e0cf42e0..fde816ded 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