rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-15 02:47:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

linker: Enforce set alignment requirements

Browse Source 
According to commentary on GCC bug
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99143, the alignment
behavior of linker sections on which RTEMS has relied was never
guaranteed to be consistent across platforms and any alignment
requirements for linker sections needs to be enforced explicitly.
This adds those explicit alignment requirements.
This commit is contained in:
Kinsey Moore 2021-02-25 12:41:05 -06:00 committed by Joel Sherrill
parent 28129f8ee6
commit 3abebabf1d
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
freebsd/sys/sys/linker_set.h
View File

@ -68,39 +68,62 @@
__used = &(sym) __used = &(sym)
#define __MAKE_SET(set, sym) __MAKE_SET_QV(set, sym, __MAKE_SET_CONST) #define __MAKE_SET(set, sym) __MAKE_SET_QV(set, sym, __MAKE_SET_CONST)
#else /* __rtems__ */ #else /* __rtems__ */
#if __cplusplus >= 201103L
#define RTEMS_BSD_ALIGNOF( _type_name ) alignof( _type_name )
#elif __STDC_VERSION__ >= 201112L
#define RTEMS_BSD_ALIGNOF( _type_name ) _Alignof( _type_name )
#else
#define RTEMS_BSD_ALIGNOF( _type_name ) sizeof( _type_name )
#endif
#define RTEMS_BSD_SET_ALIGN( type ) \
__attribute__(( __aligned__( RTEMS_BSD_ALIGNOF( type ) ) ))
#define RTEMS_BSD_DEFINE_SET(set, type) \ #define RTEMS_BSD_DEFINE_SET(set, type) \
type const __CONCAT(_bsd__start_set_,set)[0] \ RTEMS_BSD_SET_ALIGN( type ) type \
const __CONCAT(_bsd__start_set_,set)[0] \
__section(".rtemsroset.bsd." __STRING(set) ".begin") __used; \ __section(".rtemsroset.bsd." __STRING(set) ".begin") __used; \
type const __CONCAT(_bsd__stop_set_,set)[0] \ RTEMS_BSD_SET_ALIGN( type ) type \
const __CONCAT(_bsd__stop_set_,set)[0] \
__section(".rtemsroset.bsd." __STRING(set) ".end") __used __section(".rtemsroset.bsd." __STRING(set) ".end") __used
#define RTEMS_BSD_DECLARE_SET(set, type) \ #define RTEMS_BSD_DECLARE_SET(set, type) \
extern type const __CONCAT(_bsd__start_set_,set)[0]; \ extern RTEMS_BSD_SET_ALIGN( type ) type \
extern type const __CONCAT(_bsd__stop_set_,set)[0] const __CONCAT(_bsd__start_set_,set)[0]; \
extern RTEMS_BSD_SET_ALIGN( type ) type \
const __CONCAT(_bsd__stop_set_,set)[0]
#define RTEMS_BSD_DEFINE_SET_ITEM(set, sym, type) \ #define RTEMS_BSD_DEFINE_SET_ITEM(set, sym, type) \
static type const __set_##set##_sym_##sym \ static RTEMS_BSD_SET_ALIGN( type ) type \
__section(".rtemsroset.bsd." __STRING(set) ".content.1") __used const __set_##set##_sym_##sym \
__section(".rtemsroset.bsd." __STRING(set) ".content.1") __used
#define RTEMS_BSD_DEFINE_SET_ITEM_ORDERED(set, sym, order, type) \ #define RTEMS_BSD_DEFINE_SET_ITEM_ORDERED(set, sym, order, type) \
static type const __set_##set##_sym_##sym \ static RTEMS_BSD_SET_ALIGN( type ) type \
__section(".rtemsroset.bsd." __STRING(set) ".content.0." RTEMS_XSTRING( order )) __used const __set_##set##_sym_##sym \
__section(".rtemsroset.bsd." __STRING(set) ".content.0." RTEMS_XSTRING( order )) __used
#define __MAKE_SET(set, sym) \ #define __MAKE_SET(set, sym) \
RTEMS_BSD_DEFINE_SET_ITEM(set, sym, const void *) = &sym RTEMS_BSD_DEFINE_SET_ITEM(set, sym, const void *) = &sym
#define RTEMS_BSD_DEFINE_RWSET(set, type) \ #define RTEMS_BSD_DEFINE_RWSET(set, type) \
type __CONCAT(_bsd__start_set_,set)[0] \ RTEMS_BSD_SET_ALIGN( type ) type \
__CONCAT(_bsd__start_set_,set)[0] \
__section(".rtemsrwset.bsd." __STRING(set) ".begin") __used; \ __section(".rtemsrwset.bsd." __STRING(set) ".begin") __used; \
type __CONCAT(_bsd__stop_set_,set)[0] \ RTEMS_BSD_SET_ALIGN( type ) type \
__CONCAT(_bsd__stop_set_,set)[0] \
__section(".rtemsrwset.bsd." __STRING(set) ".end") __used __section(".rtemsrwset.bsd." __STRING(set) ".end") __used
#define RTEMS_BSD_DECLARE_RWSET(set, type) \ #define RTEMS_BSD_DECLARE_RWSET(set, type) \
extern type __CONCAT(_bsd__start_set_,set)[0]; \ extern RTEMS_BSD_SET_ALIGN( type ) type \
extern type __CONCAT(_bsd__stop_set_,set)[0] __CONCAT(_bsd__start_set_,set)[0]; \
extern RTEMS_BSD_SET_ALIGN( type ) type \
__CONCAT(_bsd__stop_set_,set)[0]
#define RTEMS_BSD_DEFINE_RWSET_ITEM(set, sym, type) \ #define RTEMS_BSD_DEFINE_RWSET_ITEM(set, sym, type) \
static type __set_##set##_sym_##sym \ static RTEMS_BSD_SET_ALIGN( type ) type \
__set_##set##_sym_##sym \
__section(".rtemsrwset.bsd." __STRING(set) ".content") __used __section(".rtemsrwset.bsd." __STRING(set) ".content") __used
#define __MAKE_RWSET(set, sym) \ #define __MAKE_RWSET(set, sym) \