bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Add c_enum_min_bits to target spec

Browse source
This commit is contained in:
Manish Goregaokar 2021-08-10 18:34:13 +00:00
parent ae90dcf020
commit fd116c806a
6 changed files with 515 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_target/src/abi/mod.rs
View file

@ -36,6 +36,9 @@ pub struct TargetDataLayout {
pub vector_align: Vec<(Size, AbiAndPrefAlign)>,
pub instruction_address_space: AddressSpace,
/// Minimum size of #[repr(C)] enums (default I32 bits)
pub c_enum_min_size: Integer,
}
impl Default for TargetDataLayout {
@ -60,6 +63,7 @@ impl Default for TargetDataLayout {
(Size::from_bits(128), AbiAndPrefAlign::new(align(128))),
],
instruction_address_space: AddressSpace::DATA,
c_enum_min_size: Integer::I32,
}
}
}
@ -173,6 +177,8 @@ impl TargetDataLayout {
));
}
dl.c_enum_min_size = Integer::from_size(Size::from_bits(target.c_enum_min_bits))?;
Ok(dl)
}
@ -610,6 +616,17 @@ impl Integer {
}
I8
}
fn from_size(size: Size) -> Result<Self, String> {
match size.bits() {
8 => Ok(Integer::I8),
16 => Ok(Integer::I16),
32 => Ok(Integer::I32),
64 => Ok(Integer::I64),
128 => Ok(Integer::I128),
_ => Err(format!("rust does not support integers with {} bits", size.bits())),
}
}
}
/// Fundamental unit of memory access and layout.

2
compiler/rustc_target/src/spec/hexagon_unknown_linux_musl.rs
View file

@ -13,6 +13,8 @@ pub fn target() -> Target {
base.dynamic_linking = true;
base.executables = true;
base.c_enum_min_bits = 8;
Target {
llvm_target: "hexagon-unknown-linux-musl".to_string(),
pointer_width: 32,

12
compiler/rustc_target/src/spec/mod.rs
View file

@ -1335,6 +1335,9 @@ pub struct TargetOptions {
/// If present it's a default value to use for adjusting the C ABI.
pub default_adjusted_cabi: Option<Abi>,
/// Minimum number of bits in #[repr(C)] enum. Defaults to 32.
pub c_enum_min_bits: u64,
}
impl Default for TargetOptions {
@ -1439,6 +1442,7 @@ impl Default for TargetOptions {
split_debuginfo: SplitDebuginfo::Off,
supported_sanitizers: SanitizerSet::empty(),
default_adjusted_cabi: None,
c_enum_min_bits: 32,
}
}
}
@ -1603,6 +1607,12 @@ impl Target {
base.$key_name = s;
}
} );
($key_name:ident, u64) => ( {
let name = (stringify!($key_name)).replace("_", "-");
if let Some(s) = obj.remove_key(&name).and_then(|j| Json::as_u64(&j)) {
base.$key_name = s;
}
} );
($key_name:ident, Option<u32>) => ( {
let name = (stringify!($key_name)).replace("_", "-");
if let Some(s) = obj.remove_key(&name).and_then(|j| Json::as_u64(&j)) {
@ -2016,6 +2026,7 @@ impl Target {
key!(split_debuginfo, SplitDebuginfo)?;
key!(supported_sanitizers, SanitizerSet)?;
key!(default_adjusted_cabi, Option<Abi>)?;
key!(c_enum_min_bits, u64);
if base.is_builtin {
// This can cause unfortunate ICEs later down the line.
@ -2254,6 +2265,7 @@ impl ToJson for Target {
target_option_val!(has_thumb_interworking);
target_option_val!(split_debuginfo);
target_option_val!(supported_sanitizers);
target_option_val!(c_enum_min_bits);
if let Some(abi) = self.default_adjusted_cabi {
d.insert("default-adjusted-cabi".to_string(), Abi::name(abi).to_json());