From ff7b7b8945b8ca356710abe67a867ed6fb81f74a Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Mon, 6 Feb 2017 23:38:39 +0900 Subject: [PATCH] libgloss: or1k: If available call the init for init_array There was an issue revealed in gdb testing where C++ virtual tables were not getting properly initialized. This seems to be due to the c++ global constructors moving from ctors to init_array. This fix makes sure we call the proper method for initializing the constructors in all places. --- libgloss/or1k/crt0.S | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libgloss/or1k/crt0.S b/libgloss/or1k/crt0.S index 84adba1e3..03d732355 100644 --- a/libgloss/or1k/crt0.S +++ b/libgloss/or1k/crt0.S @@ -36,6 +36,7 @@ the obvious things.. */ /* -------------------------------------------------------------------------- */ +#include "newlib.h" #include "include/or1k-asm.h" #include "include/or1k-sprs.h" @@ -96,6 +97,11 @@ _or1k_exception_stack_size: .word EXCEPTION_STACK_SIZE */ /* -------------------------------------------------------------------------- */ +#ifdef HAVE_INITFINI_ARRAY +#define _init __libc_init_array +#define _fini __libc_fini_array +#endif + #define GPR_BUF_OFFSET(x) (x << 2) #ifndef __OR1K_MULTICORE__