Skip to content

Commit bc8c554

phil-opp phil-opp

authored

Merge pull request #420 from tsatke/patch-1

adapt data layout to match LLVM's

2 parents 2e9fe88 + 2ebe789 commit bc8c554Copy full SHA for bc8c554

File tree

5 files changed

+8

-4

lines changed

bios/stage-4/src
- main.rs
i386-code16-boot-sector.json
i386-code16-stage-2.json
i686-stage-3.json
x86_64-stage-4.json

5 files changed

+8

-4

lines changed

`‎bios/stage-4/src/main.rs‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,10 @@ fn detect_rsdp() -> Option<PhysAddr> {`
`262`	`262`	`#[derive(Clone)]`
`263`	`263`	`struct IdentityMapped;`
`264`	`264`	`impl AcpiHandler for IdentityMapped {`
	`265`	`+ // TODO FIXME: This inline(never) annotation is required. Without it,`
	`266`	+ // LLVM replaces the `search_for_on_bios` call below with a `ud2`
	`267`	`+ // instruction. See https://github.com/rust-osdev/bootloader/issues/425`
	`268`	`+ #[inline(never)]`
`265`	`269`	`unsafe fn map_physical_region<T>(`
`266`	`270`	`&self,`
`267`	`271`	`physical_address: usize,`

`‎i386-code16-boot-sector.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"arch": "x86",`
`3`	`3`	`"cpu": "i386",`
`4`		`- "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",`
	`4`	`+ "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",`
`5`	`5`	`"dynamic-linking": false,`
`6`	`6`	`"executables": true,`
`7`	`7`	`"linker-flavor": "ld.lld",`

`‎i386-code16-stage-2.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"arch": "x86",`
`3`	`3`	`"cpu": "i386",`
`4`		`- "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",`
	`4`	`+ "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",`
`5`	`5`	`"dynamic-linking": false,`
`6`	`6`	`"executables": true,`
`7`	`7`	`"linker-flavor": "ld.lld",`

`‎i686-stage-3.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"arch": "x86",`
`3`	`3`	`"cpu": "i386",`
`4`		`- "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",`
	`4`	`+ "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",`
`5`	`5`	`"dynamic-linking": false,`
`6`	`6`	`"executables": true,`
`7`	`7`	`"linker-flavor": "ld.lld",`

`‎x86_64-stage-4.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"arch": "x86_64",`
`3`	`3`	`"code-model": "kernel",`
`4`	`4`	`"cpu": "x86-64",`
`5`		`- "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",`
	`5`	`+ "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",`
`6`	`6`	`"disable-redzone": true,`
`7`	`7`	`"features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float",`
`8`	`8`	`"linker": "rust-lld",`

0 commit comments

Comments

(0)