Skip to content

Commit b27c3b7

Browse files
committed
Remove legacy bitcode from all Apple specs
1 parent ed086d8 commit b27c3b7

9 files changed

+0
-94
lines changed

compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs

-12
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,7 @@ pub fn target() -> Target {
1818
options: TargetOptions {
1919
features: "+neon,+fp-armv8,+apple-a7".into(),
2020
max_atomic_width: Some(128),
21-
forces_embed_bitcode: true,
2221
frame_pointer: FramePointer::NonLeaf,
23-
// Taken from a clang build on Xcode 11.4.1.
24-
// These arguments are not actually invoked - they just have
25-
// to look right to pass App Store validation.
26-
bitcode_llvm_cmdline: "-triple\0\
27-
arm64-apple-ios11.0.0\0\
28-
-emit-obj\0\
29-
-disable-llvm-passes\0\
30-
-target-abi\0\
31-
darwinpcs\0\
32-
-Os\0"
33-
.into(),
3422
..base
3523
},
3624
}

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

-10
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,7 @@ pub fn target() -> Target {
1717
options: TargetOptions {
1818
features: "+neon,+fp-armv8,+apple-a12".into(),
1919
max_atomic_width: Some(128),
20-
forces_embed_bitcode: true,
2120
frame_pointer: FramePointer::NonLeaf,
22-
// Taken from a clang build on Xcode 11.4.1.
23-
// These arguments are not actually invoked - they just have
24-
// to look right to pass App Store validation.
25-
bitcode_llvm_cmdline: "-triple\0\
26-
arm64-apple-ios-macabi\0\
27-
-emit-obj\0\
28-
-disable-llvm-passes\0\
29-
-Os\0"
30-
.into(),
3121
..base
3222
},
3323
}

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

-12
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,7 @@ pub fn target() -> Target {
1818
options: TargetOptions {
1919
features: "+neon,+fp-armv8,+apple-a7".into(),
2020
max_atomic_width: Some(128),
21-
forces_embed_bitcode: true,
2221
frame_pointer: FramePointer::NonLeaf,
23-
// Taken from a clang build on Xcode 11.4.1.
24-
// These arguments are not actually invoked - they just have
25-
// to look right to pass App Store validation.
26-
bitcode_llvm_cmdline: "-triple\0\
27-
arm64-apple-ios14.0-simulator\0\
28-
-emit-obj\0\
29-
-disable-llvm-passes\0\
30-
-target-abi\0\
31-
darwinpcs\0\
32-
-Os\0"
33-
.into(),
3422
..base
3523
},
3624
}

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pub fn target() -> Target {
1111
options: TargetOptions {
1212
features: "+neon,+fp-armv8,+apple-a7".into(),
1313
max_atomic_width: Some(128),
14-
forces_embed_bitcode: true,
1514
frame_pointer: FramePointer::NonLeaf,
1615
..opts("tvos", arch)
1716
},

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

-13
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,7 @@ pub fn target() -> Target {
1111
options: TargetOptions {
1212
features: "+neon,+fp-armv8,+apple-a7".into(),
1313
max_atomic_width: Some(128),
14-
forces_embed_bitcode: true,
1514
frame_pointer: FramePointer::NonLeaf,
16-
// Taken from (and slightly modified) the aarch64-apple-ios-sim spec which says:
17-
// Taken from a clang build on Xcode 11.4.1.
18-
// These arguments are not actually invoked - they just have
19-
// to look right to pass App Store validation.
20-
bitcode_llvm_cmdline: "-triple\0\
21-
arm64-apple-tvos15.0-simulator\0\
22-
-emit-obj\0\
23-
-disable-llvm-passes\0\
24-
-target-abi\0\
25-
darwinpcs\0\
26-
-Os\0"
27-
.into(),
2815
..opts("tvos", arch)
2916
},
3017
}

compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs

-12
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,7 @@ pub fn target() -> Target {
1515
options: TargetOptions {
1616
features: "+neon,+fp-armv8,+apple-a7".into(),
1717
max_atomic_width: Some(128),
18-
forces_embed_bitcode: true,
1918
frame_pointer: FramePointer::NonLeaf,
20-
// Taken from a clang build on Xcode 11.4.1.
21-
// These arguments are not actually invoked - they just have
22-
// to look right to pass App Store validation.
23-
bitcode_llvm_cmdline: "-triple\0\
24-
arm64-apple-watchos5.0-simulator\0\
25-
-emit-obj\0\
26-
-disable-llvm-passes\0\
27-
-target-abi\0\
28-
darwinpcs\0\
29-
-Os\0"
30-
.into(),
3119
..opts("watchos", arch)
3220
},
3321
}

compiler/rustc_target/src/spec/targets/arm64_32_apple_watchos.rs

-11
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,8 @@ pub fn target() -> Target {
1111
options: TargetOptions {
1212
features: "+v8a,+neon,+fp-armv8,+apple-a7".into(),
1313
max_atomic_width: Some(128),
14-
forces_embed_bitcode: true,
1514
dynamic_linking: false,
1615
position_independent_executables: true,
17-
// These arguments are not actually invoked - they just have
18-
// to look right to pass App Store validation.
19-
bitcode_llvm_cmdline: "-triple\0\
20-
arm64_32-apple-watchos5.0.0\0\
21-
-emit-obj\0\
22-
-disable-llvm-passes\0\
23-
-target-abi\0\
24-
darwinpcs\0\
25-
-Os\0"
26-
.into(),
2716
..base
2817
},
2918
}

compiler/rustc_target/src/spec/targets/armv7k_apple_watchos.rs

-11
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,8 @@ pub fn target() -> Target {
1111
options: TargetOptions {
1212
features: "+v7,+vfp4,+neon".into(),
1313
max_atomic_width: Some(64),
14-
forces_embed_bitcode: true,
1514
dynamic_linking: false,
1615
position_independent_executables: true,
17-
// These arguments are not actually invoked - they just have
18-
// to look right to pass App Store validation.
19-
bitcode_llvm_cmdline: "-triple\0\
20-
armv7k-apple-watchos3.0.0\0\
21-
-emit-obj\0\
22-
-disable-llvm-passes\0\
23-
-target-abi\0\
24-
darwinpcs\0\
25-
-Os\0"
26-
.into(),
2716
..opts("watchos", arch)
2817
},
2918
}

compiler/rustc_target/src/spec/targets/x86_64_apple_watchos_sim.rs

-12
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@ pub fn target() -> Target {
1212
options: TargetOptions {
1313
max_atomic_width: Some(128),
1414
stack_probes: StackProbeType::X86,
15-
forces_embed_bitcode: true,
16-
// Taken from a clang build on Xcode 11.4.1.
17-
// These arguments are not actually invoked - they just have
18-
// to look right to pass App Store validation.
19-
bitcode_llvm_cmdline: "-triple\0\
20-
x86_64-apple-watchos5.0-simulator\0\
21-
-emit-obj\0\
22-
-disable-llvm-passes\0\
23-
-target-abi\0\
24-
darwinpcs\0\
25-
-Os\0"
26-
.into(),
2715
..opts("watchos", arch)
2816
},
2917
}

0 commit comments

Comments
 (0)