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. --- libgm2/libm2iso/ErrnoCategory.cc | 5 ++--- libgm2/libm2iso/RTco.cc | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'libgm2/libm2iso') diff --git a/libgm2/libm2iso/ErrnoCategory.cc b/libgm2/libm2iso/ErrnoCategory.cc index 70e840d..2db2639 100644 --- a/libgm2/libm2iso/ErrnoCategory.cc +++ b/libgm2/libm2iso/ErrnoCategory.cc @@ -171,9 +171,8 @@ _M2_ErrnoCategory_dep (void) { } -struct _M2_ErrnoCategory_ctor { _M2_ErrnoCategory_ctor (); } _M2_ErrnoCategory_ctor; - -_M2_ErrnoCategory_ctor::_M2_ErrnoCategory_ctor (void) +extern "C" void __attribute__((__constructor__)) +_M2_ErrnoCategory_ctor (void) { M2RTS_RegisterModule ("ErrnoCategory", _M2_ErrnoCategory_init, _M2_ErrnoCategory_fini, _M2_ErrnoCategory_dep); diff --git a/libgm2/libm2iso/RTco.cc b/libgm2/libm2iso/RTco.cc index 54c5078..b6e4665 100644 --- a/libgm2/libm2iso/RTco.cc +++ b/libgm2/libm2iso/RTco.cc @@ -459,9 +459,8 @@ RTco_init (void) return 0; } -struct _M2_RTco_ctor { _M2_RTco_ctor (); } _M2_RTco_ctor; - -_M2_RTco_ctor::_M2_RTco_ctor (void) +extern "C" void __attribute__((__constructor__)) +_M2_RTco_ctor (void) { M2RTS_RegisterModule ("RTco", _M2_RTco_init, _M2_RTco_fini, _M2_RTco_dep); -- cgit v1.1