proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-25 02:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: gcc 4.x workaround v2 for frr_interface_info

Browse Source 
The previous workaround only works for -O0, at higher optimization
levels gcc reorders the statements in the file global scope which breaks
the asm statement :(.

Fixes: #4563
Fixes: #5074
Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2019-11-30 00:36:45 +01:00
parent 6fc3fed23c
commit fa751d15a0
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/if.c
View File

@ -1650,7 +1650,32 @@ static int lib_interface_description_destroy(enum nb_event event,
} }
/* clang-format off */ /* clang-format off */
#if defined(__GNUC__) && ((__GNUC__ - 0) < 5) && !defined(__clang__)
/* gcc versions before 5.x miscalculate the size for structs with variable
* length arrays (they just count it as size 0)
*/
struct frr_yang_module_info_size3 {
/* YANG module name. */
const char *name;
/* Northbound callbacks. */
const struct {
/* Data path of this YANG node. */
const char *xpath;
/* Callbacks implemented for this node. */
struct nb_callbacks cbs;
/* Priority - lower priorities are processed first. */
uint32_t priority;
} nodes[3];
};
const struct frr_yang_module_info_size3 frr_interface_info_size3 asm("frr_interface_info") = {
#else
const struct frr_yang_module_info frr_interface_info = { const struct frr_yang_module_info frr_interface_info = {
#endif
.name = "frr-interface", .name = "frr-interface",
.nodes = { .nodes = {
{ {
@ -1677,13 +1702,3 @@ const struct frr_yang_module_info frr_interface_info = {
}, },
} }
}; };
#if defined(__GNUC__) && ((__GNUC__ - 0) < 5) && !defined(__clang__)
/* gcc versions before 5.x miscalculate the size for structs with variable
* length arrays (they just count it as size 0)
*
* NB: the "." below means "current position", i.e. this line must be
* immediately after the frr_interface_info variable!
*/
__asm__(".size\tfrr_interface_info, .-frr_interface_info\n");
#endif