diff options
| author | Tronje Krabbe <tkrabbe@jusst.de> | 2024-06-21 08:57:28 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-06-26 14:33:42 +0100 |
| commit | e262b51740878afacb8a93ed2caad87888477442 (patch) | |
| tree | da5d2865c73a964f353fc6f8bdf5d0fbc8a21249 | |
| parent | ac40cb5ee24a8ef44b941c4b9bbf6eec6f61d13c (diff) | |
| download | poky-e262b51740878afacb8a93ed2caad87888477442.tar.gz | |
rust-target-config: Update data layouts for 32-bit arm targets
update the rust data layout to sync with LLVM [1]
fixes the following build
error:
error: data-layout for target `arm-poky-linux-gnueabi`, `e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64`, differs from LLVM target's `armv7-unknown-linux-gnueabihf` default layout, `e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64`
meta-rust issue report with rust 1.76 [2]
[1] https://github.com/llvm/llvm-project/commit/308e82ecebeef1342004637db9fdf11567a299b3
[2]: https://github.com/meta-rust/meta-rust/issues/444
(From OE-Core rev: 802376953ed9f1b3e64b3cf57374c58d7ac68d88)
Signed-off-by: Tronje Krabbe <tkrabbe@jusst.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes-recipe/rust-target-config.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 330ad8a3f5..334f2e7d5f 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass | |||
| @@ -130,7 +130,7 @@ def llvm_features(d): | |||
| 130 | llvm_features[vardepvalue] = "${@llvm_features(d)}" | 130 | llvm_features[vardepvalue] = "${@llvm_features(d)}" |
| 131 | 131 | ||
| 132 | ## arm-unknown-linux-gnueabihf | 132 | ## arm-unknown-linux-gnueabihf |
| 133 | DATA_LAYOUT[arm-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" | 133 | DATA_LAYOUT[arm-eabi] = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" |
| 134 | TARGET_ENDIAN[arm-eabi] = "little" | 134 | TARGET_ENDIAN[arm-eabi] = "little" |
| 135 | TARGET_POINTER_WIDTH[arm-eabi] = "32" | 135 | TARGET_POINTER_WIDTH[arm-eabi] = "32" |
| 136 | TARGET_C_INT_WIDTH[arm-eabi] = "32" | 136 | TARGET_C_INT_WIDTH[arm-eabi] = "32" |
| @@ -138,7 +138,7 @@ MAX_ATOMIC_WIDTH[arm-eabi] = "64" | |||
| 138 | FEATURES[arm-eabi] = "+v6,+vfp2" | 138 | FEATURES[arm-eabi] = "+v6,+vfp2" |
| 139 | 139 | ||
| 140 | ## armv7-unknown-linux-gnueabihf | 140 | ## armv7-unknown-linux-gnueabihf |
| 141 | DATA_LAYOUT[armv7-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" | 141 | DATA_LAYOUT[armv7-eabi] = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" |
| 142 | TARGET_ENDIAN[armv7-eabi] = "little" | 142 | TARGET_ENDIAN[armv7-eabi] = "little" |
| 143 | TARGET_POINTER_WIDTH[armv7-eabi] = "32" | 143 | TARGET_POINTER_WIDTH[armv7-eabi] = "32" |
| 144 | TARGET_C_INT_WIDTH[armv7-eabi] = "32" | 144 | TARGET_C_INT_WIDTH[armv7-eabi] = "32" |