From a81773b5218908eb4651dd1bb8df66c271ca1eb7 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Sat, 1 Mar 2025 03:19:03 +0100 Subject: [PATCH 1/2] Add target_env = "macabi" and target_env = "sim" Replaces `target_abi` variants. The old variants are still available, but may be deprecated in the future. --- src/conditional-compilation.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conditional-compilation.md b/src/conditional-compilation.md index 4d9a4ea3b4..ad7171b645 100644 --- a/src/conditional-compilation.md +++ b/src/conditional-compilation.md @@ -196,17 +196,19 @@ Example values: * `"msvc"` * `"musl"` * `"sgx"` +* `"sim"` +* `"macabi"` r[cfg.target_abi] ### `target_abi` r[cfg.target_abi.general] -Key-value option set to further disambiguate the `target_env` with information -about the target ABI. +Key-value option set to further disambiguate the `target_env` or `target_arch` +with information about the target ABI. r[cfg.target_abi.disambiguation] For historical reasons, this value is only defined as not the empty-string when actually - needed for disambiguation. Thus, for example, on many GNU platforms, this value will be +needed for disambiguation. Thus, for example, on many GNU platforms, this value will be empty. r[cfg.target_abi.values] @@ -216,8 +218,6 @@ Example values: * `"llvm"` * `"eabihf"` * `"abi64"` -* `"sim"` -* `"macabi"` r[cfg.target_endian] ### `target_endian` From 605bf59593731f55ed25ef15d14503cc556320a5 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Thu, 2 Oct 2025 18:50:24 +0200 Subject: [PATCH 2/2] `target_abi` disambiguates the target in general --- src/conditional-compilation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conditional-compilation.md b/src/conditional-compilation.md index ad7171b645..9126ed88b7 100644 --- a/src/conditional-compilation.md +++ b/src/conditional-compilation.md @@ -203,8 +203,8 @@ r[cfg.target_abi] ### `target_abi` r[cfg.target_abi.general] -Key-value option set to further disambiguate the `target_env` or `target_arch` -with information about the target ABI. +Key-value option set to further disambiguate the target with information about +the target ABI. r[cfg.target_abi.disambiguation] For historical reasons, this value is only defined as not the empty-string when actually