| Message ID | qwUi.1785600966281995503.fgzL@lists.openembedded.org |
|---|---|
| State | New |
| Headers | show |
| Series | rust-target-config: set MIPS ABI in the target JSON | expand |
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/rust-target-config-set-MIPS-ABI-in-the-target-JSON.patch FAIL: test mbox format: Series has malformed diff lines. Create the series again using git-format-patch and ensure it applies using git am (test_mbox.TestMbox.test_mbox_format) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list) SKIP: pretest pylint: Python-unidiff parse error (test_python_pylint.PyLint.pretest_pylint) SKIP: pretest src uri left files: Patch cannot be merged (test_metadata.TestMetadata.pretest_src_uri_left_files) SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore) SKIP: test CVE tag format: Parse error Hunk diff line expected: elif fpu == "hard": SKIP: test Signed-off-by presence: Parse error Hunk diff line expected: elif fpu == "hard": SKIP: test Upstream-Status presence: Parse error Hunk diff line expected: elif fpu == "hard": SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: Python-unidiff parse error (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test src uri left files: Patch cannot be merged (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
Sorry, I am not able to send it in another way.
diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 6acbe5e688..54919091fe 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass @@ -438,6 +438,13 @@ def rust_gen_target(d, thing, wd, arch): elif fpu == "hard": tspec['abi'] = "eabihf" tspec['llvm-floatabi'] = "hard" + if arch in ["mips", "mipsel"]: + tspec['abi'] = "o32" + tspec['llvm-abiname'] = "o32" + elif arch in ["mips64", "mips64el"]: + mips_abi = "n32" if abi == "n32" else "n64" + tspec['abi'] = mips_abi + tspec['llvm-abiname'] = mips_abi tspec['default-uwtable'] = True tspec['dynamic-linking'] = True tspec['executables'] = True
rustc 1.96 (rust-lang/rust#153769) started rejecting MIPS target JSON files that do not carry both an "abi" field and a matching "llvm- abiname" field, aborting libstd-rs's do_compile with error: error loading target specification: invalid MIPS ABI name and `cfg(target_abi)` combination: ABI name: <empty> cfg(target_abi): <empty> rust_gen_target() populates the target JSON from the DATA_LAYOUT / TARGET_ENDIAN / ... varflags plus an arch-specific "abi" branch that today only covers arm/armv7. On mips*/mipsel* neither "abi" nor "llvm-abiname" is written, so rustc's stricter check fails. Cover every MIPS tune shipped in meta/conf/machine/include/mips/ arch-mips.inc's AVAILTUNES: arch=mips / mipsel -> o32 arch=mips64 / mips64el, ABIEXTENSION="" -> n64 arch=mips64 / mips64el, ABIEXTENSION=n32 -> n32 Note that the mips64-o32 / mips64el-o32 tunes (o32 ABI on a 64-bit MIPS CPU) get MIPSPKGSFX_BYTE="" from arch-mips.inc and therefore TUNE_ARCH="mips[el]"; they fall into the 32-bit branch above. Signed-off-by: WXbet <57314510+WXbet@users.noreply.github.com> --- meta/classes-recipe/rust-target-config.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.47.1.windows.1