Skip to content

Commit c469254

Browse files
tgross35tgross35
committed
Experiment: move builtins within a virtual workspace
1 parent bfc64e3 commit c469254

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+92
-80
lines changed

‎Cargo.toml‎

Lines changed: 5 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,9 @@
1-
[package]
2-
authors = ["Jorge Aparicio <[email protected]>"]
3-
name = "compiler_builtins"
4-
version = "0.1.130"
5-
license = "MIT/Apache-2.0"
6-
readme = "README.md"
7-
repository = "https://github.com/rust-lang/compiler-builtins"
8-
homepage = "https://github.com/rust-lang/compiler-builtins"
9-
documentation = "https://docs.rs/compiler_builtins"
10-
edition = "2021"
11-
description = """
12-
Compiler intrinsics used by the Rust compiler. Also available for other targets
13-
if necessary!
14-
"""
15-
include = [
16-
'/Cargo.toml',
17-
'/build.rs',
18-
'/configure.rs',
19-
'/src/*',
20-
'/examples/*',
21-
'/LICENSE.txt',
22-
'/README.md',
23-
'/compiler-rt/*',
24-
'/libm/src/math/*',
25-
]
26-
links = 'compiler-rt'
27-
28-
[lib]
29-
test = false
30-
31-
[dependencies]
32-
# For more information on this dependency see
33-
# https://github.com/rust-lang/rust/tree/master/library/rustc-std-workspace-core
34-
core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core' }
35-
36-
[build-dependencies]
37-
cc = { optional = true, version = "1.0" }
38-
39-
[dev-dependencies]
40-
panic-handler = { path = 'crates/panic-handler' }
41-
42-
[features]
43-
default = ["compiler-builtins"]
44-
45-
# Enable compilation of C code in compiler-rt, filling in some more optimized
46-
# implementations and also filling in unimplemented intrinsics
47-
c = ["cc"]
48-
49-
# Workaround for the Cranelift codegen backend. Disables any implementations
50-
# which use inline assembly and fall back to pure Rust versions (if avalible).
51-
no-asm = []
52-
53-
# Workaround for codegen backends which haven't yet implemented `f16` and
54-
# `f128` support. Disabled any intrinsics which use those types.
55-
no-f16-f128 = []
56-
57-
# Flag this library as the unstable compiler-builtins lib
58-
compiler-builtins = []
59-
60-
# Generate memory-related intrinsics like memcpy
61-
mem = []
62-
63-
# Mangle all names so this can be linked in with other versions or other
64-
# compiler-rt implementations. Also used for testing
65-
mangled-names = []
66-
67-
# Only used in the compiler's build system
68-
rustc-dep-of-std = ['compiler-builtins', 'core']
69-
70-
# This makes certain traits and function specializations public that
71-
# are not normally public but are required by the `testcrate`
72-
public-test-deps = []
73-
74-
[[example]]
75-
name = "intrinsics"
76-
required-features = ["compiler-builtins"]
77-
781
[workspace]
79-
members = ["testcrate"]
2+
resolver = "2"
3+
members = [
4+
"compiler-builtins",
5+
"testcrate"
6+
]
807

818
[profile.release]
829
panic = 'abort'

‎compiler-builtins/Cargo.toml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
[package]
2+
authors = ["Jorge Aparicio <[email protected]>"]
3+
name = "compiler_builtins"
4+
version = "0.1.130"
5+
license = "MIT/Apache-2.0"
6+
readme = "README.md"
7+
repository = "https://github.com/rust-lang/compiler-builtins"
8+
homepage = "https://github.com/rust-lang/compiler-builtins"
9+
documentation = "https://docs.rs/compiler_builtins"
10+
edition = "2021"
11+
description = """
12+
Compiler intrinsics used by the Rust compiler. Also available for other targets
13+
if necessary!
14+
"""
15+
include = [
16+
'/Cargo.toml',
17+
'/build.rs',
18+
'/configure.rs',
19+
'/src/*',
20+
'/examples/*',
21+
'/LICENSE.txt',
22+
'/README.md',
23+
'/compiler-rt/*',
24+
'/libm/src/math/*',
25+
]
26+
links = 'compiler-rt'
27+
28+
[lib]
29+
test = false
30+
31+
[dependencies]
32+
# For more information on this dependency see
33+
# https://github.com/rust-lang/rust/tree/master/library/rustc-std-workspace-core
34+
core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core' }
35+
36+
[build-dependencies]
37+
cc = { optional = true, version = "1.0" }
38+
39+
[dev-dependencies]
40+
panic-handler = { path = '../crates/panic-handler' }
41+
42+
[features]
43+
default = ["compiler-builtins"]
44+
45+
# Enable compilation of C code in compiler-rt, filling in some more optimized
46+
# implementations and also filling in unimplemented intrinsics
47+
c = ["cc"]
48+
49+
# Workaround for the Cranelift codegen backend. Disables any implementations
50+
# which use inline assembly and fall back to pure Rust versions (if avalible).
51+
no-asm = []
52+
53+
# Workaround for codegen backends which haven't yet implemented `f16` and
54+
# `f128` support. Disabled any intrinsics which use those types.
55+
no-f16-f128 = []
56+
57+
# Flag this library as the unstable compiler-builtins lib
58+
compiler-builtins = []
59+
60+
# Generate memory-related intrinsics like memcpy
61+
mem = []
62+
63+
# Mangle all names so this can be linked in with other versions or other
64+
# compiler-rt implementations. Also used for testing
65+
mangled-names = []
66+
67+
# Only used in the compiler's build system
68+
rustc-dep-of-std = ['compiler-builtins', 'core']
69+
70+
# This makes certain traits and function specializations public that
71+
# are not normally public but are required by the `testcrate`
72+
public-test-deps = []
73+
74+
[[example]]
75+
name = "intrinsics"
76+
required-features = ["compiler-builtins"]
77+
78+
# [workspace]
79+
# members = ["testcrate"]
80+
81+
[profile.release]
82+
panic = 'abort'
83+
84+
[profile.dev]
85+
panic = 'abort'

build.rs renamed to compiler-builtins/build.rs

File renamed without changes.

configure.rs renamed to compiler-builtins/configure.rs

File renamed without changes.

examples/intrinsics.rs renamed to compiler-builtins/examples/intrinsics.rs

File renamed without changes.

src/aarch64.rs renamed to compiler-builtins/src/aarch64.rs

File renamed without changes.

src/aarch64_linux.rs renamed to compiler-builtins/src/aarch64_linux.rs

File renamed without changes.

src/arm.rs renamed to compiler-builtins/src/arm.rs

File renamed without changes.

src/arm_linux.rs renamed to compiler-builtins/src/arm_linux.rs

File renamed without changes.

src/float/add.rs renamed to compiler-builtins/src/float/add.rs

File renamed without changes.

0 commit comments

Comments
 (0)