Commit 7f26036

committed

compiler: Apply target features to the entry function

1 parent 51ff895 commit 7f26036Copy full SHA for 7f26036

File tree

2 files changed

+20

-9

lines changed

compiler/rustc_codegen_llvm/src
- attributes.rs
- context.rs

2 files changed

+20

-9

lines changed

`‎compiler/rustc_codegen_llvm/src/attributes.rs‎`

Lines changed: 14 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,19 @@ pub(crate) fn tune_cpu_attr<'ll>(cx: &CodegenCx<'ll, '_>) -> Option<&'ll Attribu`
`286`	`286`	`.map(\|tune_cpu\| llvm::CreateAttrStringValue(cx.llcx, "tune-cpu", tune_cpu))`
`287`	`287`	`}`
`288`	`288`
	`289`	+/// Get the `target-features` LLVM attribute.
	`290`	`+pub(crate) fn target_features_attr<'ll>(`
	`291`	`+ cx: &CodegenCx<'ll, '_>,`
	`292`	`+ function_features: Vec<String>,`
	`293`	`+) -> Option<&'ll Attribute> {`
	`294`	`+ let global_features = cx.tcx.global_backend_features(()).iter().map(String::as_str);`
	`295`	`+ let function_features = function_features.iter().map(String::as_str);`
	`296`	`+ let target_features =`
	`297`	`+ global_features.chain(function_features).intersperse(",").collect::<String>();`
	`298`	`+ (!target_features.is_empty())`
	`299`	`+ .then(\|\| llvm::CreateAttrStringValue(cx.llcx, "target-features", &target_features))`
	`300`	`+}`
	`301`	`+`
`289`	`302`	/// Get the `NonLazyBind` LLVM attribute,
`290`	`303`	`/// if the codegen options allow skipping the PLT.`
`291`	`304`	`pub(crate) fn non_lazy_bind_attr<'ll>(cx: &CodegenCx<'ll, '_>) -> Option<&'ll Attribute> {`
`@@ -513,13 +526,7 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(`
`513`	`526`	`}`
`514`	`527`	`}`
`515`	`528`
`516`		`- let global_features = cx.tcx.global_backend_features(()).iter().map(\|s\| s.as_str());`
`517`		`- let function_features = function_features.iter().map(\|s\| s.as_str());`
`518`		`- let target_features: String =`
`519`		`- global_features.chain(function_features).intersperse(",").collect();`
`520`		`- if !target_features.is_empty() {`
`521`		`- to_add.push(llvm::CreateAttrStringValue(cx.llcx, "target-features", &target_features));`
`522`		`- }`
	`529`	`+ to_add.extend(target_features_attr(cx, function_features));`
`523`	`530`
`524`	`531`	`attributes::apply_to_llfn(llfn, Function, &to_add);`
`525`	`532`	`}`

`‎compiler/rustc_codegen_llvm/src/context.rs‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -849,15 +849,19 @@ impl<'ll, 'tcx> MiscCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {`
`849`	`849`	`fn declare_c_main(&self, fn_type: Self::Type) -> Option<Self::Function> {`
`850`	`850`	`let entry_name = self.sess().target.entry_name.as_ref();`
`851`	`851`	`if self.get_declared_value(entry_name).is_none() {`
`852`		`- Some(self.declare_entry_fn(`
	`852`	`+ let llfn = self.declare_entry_fn(`
`853`	`853`	`entry_name,`
`854`	`854`	`llvm::CallConv::from_conv(`
`855`	`855`	`self.sess().target.entry_abi,`
`856`	`856`	`self.sess().target.arch.borrow(),`
`857`	`857`	`),`
`858`	`858`	`llvm::UnnamedAddr::Global,`
`859`	`859`	`fn_type,`
`860`		`- ))`
	`860`	`+ );`
	`861`	`+ if let Some(attr) = attributes::target_features_attr(self, vec![]) {`
	`862`	`+ attributes::apply_to_llfn(llfn, llvm::AttributePlace::Function, &[attr])`
	`863`	`+ }`
	`864`	`+ Some(llfn)`
`861`	`865`	`} else {`
`862`	`866`	`// If the symbol already exists, it is an error: for example, the user wrote`
`863`	`867`	`// #[no_mangle] extern "C" fn main(..) {..}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 7f26036

File tree

2 files changed

2 files changed

`‎compiler/rustc_codegen_llvm/src/attributes.rs‎`

`‎compiler/rustc_codegen_llvm/src/context.rs‎`

0 commit comments