Commit 66af40f

committed

variants/_ldscripts: Fix static thread data alignment.

The _static_thread_data struct contains int64_t members that require 8-byte alignment. When placed in a 4-byte aligned section, it causes the linker to insert padding, which in turn causes __static_thread_data_list_start to point to the padding not to the first iterable. GNU ld automatically aligns output sections based on the strictest alignment requirement of input sections, so moving __static_thread_data_list to its own section fixes the problem. Signed-off-by: iabdalkader <i.abdalkader@gmail.com>

1 parent cbf7e44 commit 66af40fCopy full SHA for 66af40f

File tree

2 files changed

-3

lines changed

variants/_ldscripts
- build-dynamic.ld
- build-static.ld

2 files changed

-3

lines changed

`‎variants/_ldscripts/build-dynamic.ld‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,11 @@ SECTIONS {`
`34`	`34`	`KEEP (*(.ctors))`
`35`	`35`	`KEEP (*(.dtors))`
`36`	`36`	`KEEP (*(.fini))`
	`37`	`+ }`
`37`	`38`
	`39`	`+ .static_thread_data_area : {`
`38`	`40`	`__static_thread_data_list_start = .;`
`39`		`- KEEP((SORT_BY_NAME(.__static_thread_data.static.)));`
	`41`	`+ KEEP((.static_thread_data_areaSORT_BY_NAME(.__static_thread_data.)));`
`40`	`42`	`__static_thread_data_list_end = .;`
`41`	`43`	`}`
`42`	`44`
`@@ -87,4 +89,4 @@ SECTIONS {`
`87`	`89`	`.got : {`
`88`	`90`	`KEEP((.got .got. .got.plt .got.plt*))`
`89`	`91`	`}`
`90`		`-}`
	`92`	`+}`

`‎variants/_ldscripts/build-static.ld‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,11 @@ SECTIONS {`
`23`	`23`	`KEEP (*(.ctors))`
`24`	`24`	`KEEP (*(.dtors))`
`25`	`25`	`KEEP (*(.fini))`
	`26`	`+ } >FLASH`
`26`	`27`
	`28`	`+ .static_thread_data_area : {`
`27`	`29`	`__static_thread_data_list_start = .;`
`28`		`- KEEP((SORT_BY_NAME(.__static_thread_data.static.)));`
	`30`	`+ KEEP((.static_thread_data_areaSORT_BY_NAME(.__static_thread_data.)));`
`29`	`31`	`__static_thread_data_list_end = .;`
`30`	`32`	`} >FLASH`
`31`	`33`

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!

Uh oh!

Commit 66af40f

File tree

2 files changed

2 files changed

`‎variants/_ldscripts/build-dynamic.ld‎`

`‎variants/_ldscripts/build-static.ld‎`

0 commit comments