Skip to content

Commit

Permalink
Rollup merge of rust-lang#66084 - petrochenkov:x86arm, r=alexcrichton
Browse files Browse the repository at this point in the history
Do not require extra LLVM backends for `x.py test` to pass

For long time our testing passed with a partially built LLVM
```
[llvm]
targets = "X86;ARM"
```
, a [recent PR](rust-lang#65809) changed that.
  • Loading branch information
pietroalbini authored Nov 6, 2019
2 parents 9bfb5cc + d22a659 commit ab08821
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/test/codegen/abi-efiapi.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// Checks if the correct annotation for the efiapi ABI is passed to llvm.

// revisions:x86_64 i686 aarch64 arm riscv
// revisions:x86_64 i686 arm

// min-llvm-version 9.0

//[x86_64] compile-flags: --target x86_64-unknown-uefi
//[i686] compile-flags: --target i686-unknown-linux-musl
//[aarch64] compile-flags: --target aarch64-unknown-none
//[arm] compile-flags: --target armv7r-none-eabi
//[riscv] compile-flags: --target riscv64gc-unknown-none-elf
// compile-flags: -C no-prepopulate-passes

#![crate_type = "lib"]
Expand All @@ -24,8 +22,6 @@ trait Copy { }

//x86_64: define win64cc void @has_efiapi
//i686: define void @has_efiapi
//aarch64: define void @has_efiapi
//arm: define void @has_efiapi
//riscv: define void @has_efiapi
#[no_mangle]
pub extern "efiapi" fn has_efiapi() {}

0 comments on commit ab08821

Please sign in to comment.