target abi #86922

joshtriplett · 2021-07-07T05:55:33Z

Implement cfg(target_abi) (RFC 2992)

Add an abi field to TargetOptions, defaulting to "". Support using
cfg(target_abi = "...") for conditional compilation on that field.

Gated by feature(cfg_target_abi).

Add a test for target_abi, and a test for the feature gate.

Add target_abi to tidy as a platform-specific cfg.

Update targets to use target_abi

All eabi targets have target_abi = "eabi".
All eabihf targets have target_abi = "eabihf".
armv6_unknown_freebsd and armv7_unknown_freebsd have target_abi = "eabihf".
All abi64 targets have target_abi = "abi64".
All ilp32 targets have target_abi = "ilp32".
All softfloat targets have target_abi = "softfloat".
All -uwp-windows- targets have target_abi = "uwp".
All spe targets have target_abi = "spe".
All macabi targets have target_abi = "macabi".
aarch64-apple-ios-sim has target_abi = "sim".
x86_64-fortanix-unknown-sgx has target_abi = "fortanix".
x86_64-unknown-linux-gnux32 has target_abi = "x32".

Add FIXME entries for targets for which existing values need to change
once cfg_target_abi becomes stable. (All of them are tier 3 targets.)

Add a test for target_abi in --print cfg.

rust-highfive · 2021-07-07T05:55:36Z

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2021-07-07T05:55:36Z

⚠️ Warning ⚠️

These commits modify compiler targets. (See the Target Tier Policy.)

Add an `abi` field to `TargetOptions`, defaulting to "". Support using `cfg(target_abi = "...")` for conditional compilation on that field. Gated by `feature(cfg_target_abi)`. Add a test for `target_abi`, and a test for the feature gate. Add `target_abi` to tidy as a platform-specific cfg. This does not add an abi to any existing target.

All eabi targets have target_abi = "eabi". All eabihf targets have target_abi = "eabihf". armv6_unknown_freebsd and armv7_unknown_freebsd have target_abi = "eabihf". All abi64 targets have target_abi = "abi64". All ilp32 targets have target_abi = "ilp32". All softfloat targets have target_abi = "softfloat". All *-uwp-windows-* targets have target_abi = "uwp". All spe targets have target_abi = "spe". All macabi targets have target_abi = "macabi". aarch64-apple-ios-sim has target_abi = "sim". x86_64-fortanix-unknown-sgx has target_abi = "fortanix". x86_64-unknown-linux-gnux32 has target_abi = "x32". Add FIXME entries for targets for which existing values need to change once cfg_target_abi becomes stable. (All of them are tier 3 targets.) Add a test for target_abi in `--print cfg`.

oli-obk · 2021-07-08T15:08:35Z

@bors r+

bors · 2021-07-08T15:08:36Z

📌 Commit c3fbafd has been approved by oli-obk

nagisa · 2021-07-08T20:39:20Z

I know I'm late to the party.

Add an abi field to TargetOptions, defaulting to "".

Does that mean that for these targets cfg(target_abi = "") will be true? This would be, I believe, the first instance of this in the compiler-defined targets.

All eabi targets have target_abi = "eabi".
All eabihf targets have target_abi = "eabihf".
All softfloat targets have target_abi = "softfloat".

This makes me wonder if target_abi should be a zero-or-more kind of variable. For example, softfloat is a more general property that is shared with eabi.

bors · 2021-07-10T02:27:47Z

⌛ Testing commit c3fbafd with merge 59740625d3c7cdc653045f4de4b973b2c08128f0...

rust-log-analyzer · 2021-07-10T03:06:57Z

The job i686-msvc-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

test [ui] ui\wrong-hashset-issue-42918.rs ... ok

failures:

---- [ui] ui\rfc-2627-raw-dylib\multiple-definitions.rs stdout ----
$DIR\multiple-definitions.rs
$DIR\multiple-definitions.rs

8    = note: see issue #58713 <https://github.com/rust-lang/rust/issues/58713> for more information
9 
9 
10 error: multiple definitions of external function `f` from library `foo.dll` have different calling conventions
-   --> $DIR/multiple-definitions.rs:8:5
12    |
12    |
- LL |     fn f(x: i32);
-    |     ^^^^^^^^^^^^^
+ LL |         fn f(x: i32);
15 
16 error: aborting due to previous error; 1 warning emitted
17 

---
To only update this specific test, also pass `--test-args rfc-2627-raw-dylib\multiple-definitions.rs`

error: 1 errors occurred comparing output.
status: exit code: 1
command: PATH="D:\a\rust\rust\build\i686-pc-windows-msvc\stage2\bin;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30037\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30037\bin\HostX64\x86;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\msys2\mingw32\bin;C:\hostedtoolcache\windows\Python\3.9.5\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.5\x64;C:\msys64\usr\bin;D:\a\rust\rust\sccache;C:\Users\runneradmin\.dotnet\tools;C:\Program Files\MongoDB\Server\4.4\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.7.1\x64;C:\tools\ghc-9.0.1\bin;C:\Program Files\dotnet;C:\mysql-5.7.21-winx64\bin;C:\Program Files\R\R-4.1.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Rust\.cargo\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\hostedtoolcache\windows\go\1.15.13\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\hostedtoolcache\windows\Java_Adopt_jdk\8.0.292-10\x64\bin;C:\npm\prefix;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Docker;C:\Program Files\PowerShell\7;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\nodejs;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.1\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\OpenSSL\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files\TortoiseSVN\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\CMake\bin;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "D:\\a\\rust\\rust\\src/test\\ui\\rfc-2627-raw-dylib\\multiple-definitions.rs" "-Zthreads=1" "--target=i686-pc-windows-msvc" "--error-format" "json" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zemit-future-incompat-report" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\rfc-2627-raw-dylib\\multiple-definitions" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--crate-type" "lib" "--emit" "link" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\rfc-2627-raw-dylib\\multiple-definitions\\auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
warning: the feature `raw_dylib` is incomplete and may not be safe to use and/or cause compiler crashes
  --> D:\a\rust\rust\src/test\ui\rfc-2627-raw-dylib\multiple-definitions.rs:4:12
   |
LL | #![feature(raw_dylib)]
   |
   = note: `#[warn(incomplete_features)]` on by default
   = note: see issue #58713 <https://github.com/rust-lang/rust/issues/58713> for more information


error: multiple definitions of external function `f` from library `foo.dll` have different calling conventions
  --> D:\a\rust\rust\src/test\ui\rfc-2627-raw-dylib\multiple-definitions.rs:15:9
   |
LL |         fn f(x: i32);

error: aborting due to previous error; 1 warning emitted


---
    [ui] ui\rfc-2627-raw-dylib\multiple-definitions.rs

test result: FAILED. 11931 passed; 1 failed; 183 ignored; 0 measured; 0 filtered out; finished in 364.13s

Some tests failed in compiletest suite=ui mode=ui host=i686-pc-windows-msvc target=i686-pc-windows-msvc


command did not execute successfully: "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--src-base" "D:\\a\\rust\\rust\\src/test\\ui" "--build-base" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui" "--stage-id" "stage2-i686-pc-windows-msvc" "--suite" "ui" "--mode" "ui" "--target" "i686-pc-windows-msvc" "--host" "i686-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--npm" "C:\\Program Files\\nodejs\\npm" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.5\\x64\\python3.exe" "--lldb-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.5\\x64\\python3.exe" "--gdb" "C:\\msys64\\usr\\bin\\gdb" "--llvm-version" "12.0.1-rust-1.55.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"


Build completed unsuccessfully in 0:34:34
Build completed unsuccessfully in 0:34:34
make: *** [Makefile:74: ci-subset-2] Error 1

bors · 2021-07-10T03:07:17Z

💔 Test failed - checks-actions

joshtriplett · 2021-07-11T18:57:50Z

@nagisa I think it should be 0-or-more, yes. That would take an updated RFC to propose. In the meantime, this is forward-compatible; we can always make target_abi match multiple things.

joshtriplett · 2021-07-11T19:13:48Z

The test failure appears to be entirely unrelated.

joshtriplett · 2021-07-11T19:22:22Z

#86419 (comment)

joshtriplett · 2021-07-13T01:24:07Z

@bors retry

bors · 2021-07-13T12:25:18Z

⌛ Testing commit c3fbafd with merge ca99e3e...

bors · 2021-07-13T15:06:05Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing ca99e3e to master...

rust-highfive assigned oli-obk Jul 7, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 7, 2021

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the target-abi branch from 1a0e980 to 065bec2 Compare July 7, 2021 06:16

This comment has been minimized.

Sign in to view

petrochenkov assigned petrochenkov and unassigned petrochenkov Jul 7, 2021

joshtriplett force-pushed the target-abi branch from 065bec2 to 7b5a6ee Compare July 7, 2021 14:43

joshtriplett mentioned this pull request Jul 7, 2021

Tracking Issue for cfg-target-abi #80970

Closed

4 tasks

joshtriplett force-pushed the target-abi branch from 7b5a6ee to 7ff2838 Compare July 7, 2021 15:23

joshtriplett added 2 commits July 7, 2021 08:52

joshtriplett force-pushed the target-abi branch from 7ff2838 to c3fbafd Compare July 7, 2021 15:52

joshtriplett marked this pull request as ready for review July 7, 2021 17:32

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 8, 2021

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 10, 2021

fee1-dead mentioned this pull request Jul 12, 2021

Fix multiple-definitions test #87075

Closed

This was referenced Jul 12, 2021

Add support for raw-dylib with stdcall, fastcall functions #86419

Merged

Unrelated changes make multiple-definitions test fail spuriously #87084

Closed

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 13, 2021

bors merged commit ca99e3e into rust-lang:master Jul 13, 2021

rustbot added this to the 1.55.0 milestone Jul 13, 2021

joshtriplett deleted the target-abi branch July 16, 2021 16:30

This was referenced Nov 4, 2022

Parse target_abi if it's present even though it's unstable EmbarkStudios/cfg-expr#52

Closed

Upgrade cfg-expr to support parsing of target_abi cfg guppy-rs/guppy#33

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

target abi #86922

target abi #86922

joshtriplett commented Jul 7, 2021 •

edited

Loading

rust-highfive commented Jul 7, 2021

rust-highfive commented Jul 7, 2021

This comment has been minimized.

This comment has been minimized.

oli-obk commented Jul 8, 2021

bors commented Jul 8, 2021

nagisa commented Jul 8, 2021 •

edited

Loading

bors commented Jul 10, 2021

rust-log-analyzer commented Jul 10, 2021

bors commented Jul 10, 2021

joshtriplett commented Jul 11, 2021

joshtriplett commented Jul 11, 2021

joshtriplett commented Jul 11, 2021

joshtriplett commented Jul 13, 2021

bors commented Jul 13, 2021

bors commented Jul 13, 2021

target abi #86922

target abi #86922

Conversation

joshtriplett commented Jul 7, 2021 • edited Loading

rust-highfive commented Jul 7, 2021

rust-highfive commented Jul 7, 2021

This comment has been minimized.

This comment has been minimized.

oli-obk commented Jul 8, 2021

bors commented Jul 8, 2021

nagisa commented Jul 8, 2021 • edited Loading

bors commented Jul 10, 2021

rust-log-analyzer commented Jul 10, 2021

bors commented Jul 10, 2021

joshtriplett commented Jul 11, 2021

joshtriplett commented Jul 11, 2021

joshtriplett commented Jul 11, 2021

joshtriplett commented Jul 13, 2021

bors commented Jul 13, 2021

bors commented Jul 13, 2021

joshtriplett commented Jul 7, 2021 •

edited

Loading

nagisa commented Jul 8, 2021 •

edited

Loading