From ec6d1fc09faea4a6be4df74babb73dca6b50ff0c Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Fri, 30 Dec 2022 19:46:13 +0000 Subject: modula-2: Fix registration of modules via constructors [PR108183]. This reworks the mechanism used for module registration to use init- time constructors. The order of registration is not important, the actual initialization dependency tree will be computed early in the execution (all that matters is that we have registered before that). This fixes a potential issue in which the external name known to the m2 system is of the form _M2_XXXXXX_ctor() but the C++ code was producing a static variable instance with the same name. Signed-off-by: Iain Sandoe PR modula2/108183 gcc/m2/ChangeLog: * gm2-libs-ch/UnixArgs.cc (_M2_UnixArgs_ctor): Rework to use an extern "C" function with 'constructor' attribute. * gm2-libs-ch/dtoa.cc (_M2_dtoa_ctor): Likewise. * gm2-libs-ch/ldtoa.cc (_M2_ldtoa_ctor): Likewise. libgm2/ChangeLog: * libm2cor/KeyBoardLEDs.cc (_M2_KeyBoardLEDs_ctor): Rework to use an extern "C" function with 'constructor' attribute. * libm2iso/ErrnoCategory.cc (_M2_ErrnoCategory_ctor): Likewise. * libm2iso/RTco.cc (_M2_RTco_ctor): Likewise. * libm2pim/Selective.cc (_M2_Selective_ctor): Likewise. * libm2pim/SysExceptions.cc (_M2_SysExceptions_ctor): Likewise. * libm2pim/UnixArgs.cc (_M2_UnixArgs_ctor): Likewise. * libm2pim/cgetopt.cc (_M2_cgetopt_ctor): Likewise. * libm2pim/dtoa.cc (_M2_dtoa_ctor): Likewise. * libm2pim/errno.cc (_M2_errno_ctor): Likewise. * libm2pim/ldtoa.cc (_M2_ldtoa_ctor): Likewise. * libm2pim/sckt.cc (_M2_sckt_ctor): Likewise. * libm2pim/termios.cc (_M2_termios_ctor): Likewise. * libm2pim/wrapc.c: Add a new line to the file end. --- gcc/m2/gm2-libs-ch/UnixArgs.cc | 5 ++--- gcc/m2/gm2-libs-ch/dtoa.cc | 5 ++--- gcc/m2/gm2-libs-ch/ldtoa.cc | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'gcc') diff --git a/gcc/m2/gm2-libs-ch/UnixArgs.cc b/gcc/m2/gm2-libs-ch/UnixArgs.cc index 1180f35..4bb3769 100644 --- a/gcc/m2/gm2-libs-ch/UnixArgs.cc +++ b/gcc/m2/gm2-libs-ch/UnixArgs.cc @@ -82,9 +82,8 @@ _M2_UnixArgs_dep (void) { } -struct _M2_UnixArgs_ctor { _M2_UnixArgs_ctor (); } _M2_UnixArgs_ctor; - -_M2_UnixArgs_ctor::_M2_UnixArgs_ctor (void) +extern "C" void __attribute__((__constructor__)) +_M2_UnixArgs_ctor (void) { M2RTS_RegisterModule ("UnixArgs", _M2_UnixArgs_init, _M2_UnixArgs_finish, _M2_UnixArgs_dep); diff --git a/gcc/m2/gm2-libs-ch/dtoa.cc b/gcc/m2/gm2-libs-ch/dtoa.cc index 5731758..111fc4b 100644 --- a/gcc/m2/gm2-libs-ch/dtoa.cc +++ b/gcc/m2/gm2-libs-ch/dtoa.cc @@ -189,9 +189,8 @@ _M2_dtoa_dep (void) #ifdef __cplusplus } -struct _M2_dtoa_ctor { _M2_dtoa_ctor (); } _M2_dtoa_ctor; - -_M2_dtoa_ctor::_M2_dtoa_ctor (void) +extern "C" void __attribute__((__constructor__)) +_M2_dtoa_ctor (void) { M2RTS_RegisterModule ("dtoa", _M2_dtoa_init, _M2_dtoa_finish, _M2_dtoa_dep); diff --git a/gcc/m2/gm2-libs-ch/ldtoa.cc b/gcc/m2/gm2-libs-ch/ldtoa.cc index ac14297..8d9e648 100644 --- a/gcc/m2/gm2-libs-ch/ldtoa.cc +++ b/gcc/m2/gm2-libs-ch/ldtoa.cc @@ -118,9 +118,8 @@ _M2_ldtoa_dep (void) # ifdef __cplusplus } -struct _M2_ldtoa_ctor { _M2_ldtoa_ctor (); } _M2_ldtoa_ctor; - -_M2_ldtoa_ctor::_M2_ldtoa_ctor (void) +extern "C" void __attribute__((__constructor__)) +_M2_ldtoa_ctor (void) { M2RTS_RegisterModule ("ldtoa", _M2_ldtoa_init, _M2_ldtoa_finish, _M2_ldtoa_dep); -- cgit v1.1