Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small nits to make couple of tests pass on mips targets. #49665

Merged
merged 3 commits into from
Apr 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/test/codegen/link_section.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@
// CHECK: @VAR1 = constant <{ [4 x i8] }> <{ [4 x i8] c"\01\00\00\00" }>, section ".test_one"
#[no_mangle]
#[link_section = ".test_one"]
#[cfg(target_endian = "little")]
pub static VAR1: u32 = 1;

#[no_mangle]
#[link_section = ".test_one"]
#[cfg(target_endian = "big")]
pub static VAR1: u32 = 0x01000000;

pub enum E {
A(u32),
B(f32)
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm-out-assign-imm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// ignore-emscripten
// ignore-powerpc
// ignore-sparc
// ignore-mips

#![feature(asm)]

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/asm-out-assign-imm.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0384]: cannot assign twice to immutable variable `x`
--> $DIR/asm-out-assign-imm.rs:29:9
--> $DIR/asm-out-assign-imm.rs:30:9
|
LL | x = 1;
| ----- first assignment to `x`
Expand Down
3 changes: 3 additions & 0 deletions src/test/ui/target-feature-wrong.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
// ignore-aarch64
// ignore-wasm
// ignore-emscripten
// ignore-mips
// ignore-powerpc
// ignore-s390x

#![feature(target_feature)]

Expand Down
14 changes: 7 additions & 7 deletions src/test/ui/target-feature-wrong.stderr
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
warning: #[target_feature = ".."] is deprecated and will eventually be removed, use #[target_feature(enable = "..")] instead
--> $DIR/target-feature-wrong.rs:18:1
--> $DIR/target-feature-wrong.rs:21:1
|
LL | #[target_feature = "+sse2"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: the feature named `foo` is not valid for this target
--> $DIR/target-feature-wrong.rs:20:18
--> $DIR/target-feature-wrong.rs:23:18
|
LL | #[target_feature(enable = "foo")]
| ^^^^^^^^^^^^^^

error: #[target_feature(..)] only accepts sub-keys of `enable` currently
--> $DIR/target-feature-wrong.rs:22:18
--> $DIR/target-feature-wrong.rs:25:18
|
LL | #[target_feature(bar)]
| ^^^

error: #[target_feature(..)] only accepts sub-keys of `enable` currently
--> $DIR/target-feature-wrong.rs:24:18
--> $DIR/target-feature-wrong.rs:27:18
|
LL | #[target_feature(disable = "baz")]
| ^^^^^^^^^^^^^^^

error: #[target_feature(..)] can only be applied to `unsafe` function
--> $DIR/target-feature-wrong.rs:28:1
--> $DIR/target-feature-wrong.rs:31:1
|
LL | #[target_feature(enable = "sse2")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: attribute should be applied to a function
--> $DIR/target-feature-wrong.rs:32:1
--> $DIR/target-feature-wrong.rs:35:1
|
LL | #[target_feature(enable = "sse2")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -38,7 +38,7 @@ LL | mod another {}
| -------------- not a function

error: cannot use #[inline(always)] with #[target_feature]
--> $DIR/target-feature-wrong.rs:36:1
--> $DIR/target-feature-wrong.rs:39:1
|
LL | #[inline(always)]
| ^^^^^^^^^^^^^^^^^
Expand Down