Commit beb0304

committed

compiler: Apply target features to the entry function

1 parent 51ff895 commit beb0304Copy full SHA for beb0304

File tree

+17

-0

lines changed

+17

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,10 @@ impl<'gcc, 'tcx> MiscCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {`
`483`	`483`	`// TODO(antoyo)`
`484`	`484`	`}`
`485`	`485`
	`486`	`+ fn apply_target_features(&self, _llfn: Function<'gcc>) {`
	`487`	`+ // TODO(antoyo)`
	`488`	`+ }`
	`489`	`+`
`486`	`490`	`fn declare_c_main(&self, fn_type: Self::Type) -> Option<Self::Function> {`
`487`	`491`	`let entry_name = self.sess().target.entry_name.as_ref();`
`488`	`492`	`if !self.functions.borrow().contains_key(entry_name) {`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -846,6 +846,16 @@ impl<'ll, 'tcx> MiscCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {`
`846`	`846`	`attributes::apply_to_llfn(llfn, llvm::AttributePlace::Function, &attrs);`
`847`	`847`	`}`
`848`	`848`
	`849`	`+ fn apply_target_features(&self, llfn: &'ll Value) {`
	`850`	`+ let mut attrs = SmallVec::<[_; 2]>::new();`
	`851`	`+ let global_features = self.tcx.global_backend_features(()).iter().map(\|s\| s.as_str());`
	`852`	`+ let target_features: String = global_features.intersperse(",").collect();`
	`853`	`+ if !target_features.is_empty() {`
	`854`	`+ attrs.push(llvm::CreateAttrStringValue(self.llcx, "target-features", &target_features));`
	`855`	`+ }`
	`856`	`+ attributes::apply_to_llfn(llfn, llvm::AttributePlace::Function, &attrs);`
	`857`	`+ }`
	`858`	`+`
`849`	`859`	`fn declare_c_main(&self, fn_type: Self::Type) -> Option<Self::Function> {`
`850`	`860`	`let entry_name = self.sess().target.entry_name.as_ref();`
`851`	`861`	`if self.get_declared_value(entry_name).is_none() {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -524,6 +524,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(`
`524`	`524`	// `main` should respect same config for frame pointer elimination as rest of code
`525`	`525`	`cx.set_frame_pointer_type(llfn);`
`526`	`526`	`cx.apply_target_cpu_attr(llfn);`
	`527`	`+ cx.apply_target_features(llfn);`
`527`	`528`
`528`	`529`	`let llbb = Bx::append_block(cx, llfn, "top");`
`529`	`530`	`let mut bx = Bx::build(cx, llbb);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ pub trait MiscCodegenMethods<'tcx>: BackendTypes {`
`23`	`23`	`fn sess(&self) -> &Session;`
`24`	`24`	`fn set_frame_pointer_type(&self, llfn: Self::Function);`
`25`	`25`	`fn apply_target_cpu_attr(&self, llfn: Self::Function);`
	`26`	`+ /// Apply global target features to a given LLVM function.`
	`27`	`+ fn apply_target_features(&self, llfn: Self::Function);`
`26`	`28`	`/// Declares the extern "C" main function for the entry point. Returns None if the symbol`
`27`	`29`	`/// already exists.`
`28`	`30`	`fn declare_c_main(&self, fn_type: Self::Type) -> Option<Self::Function>;`

Comments

(0)