diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2022-12-30 19:46:13 +0000 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2023-01-04 14:54:41 +0000 |
| commit | ec6d1fc09faea4a6be4df74babb73dca6b50ff0c (patch) | |
| tree | e486111f56a402f9f556cc2ac148bb481dd01416 /gcc | |
| parent | 751c2d9a46f786381a90d5c8c49947fa0d9b7ee5 (diff) | |
| download | gcc-ec6d1fc09faea4a6be4df74babb73dca6b50ff0c.zip gcc-ec6d1fc09faea4a6be4df74babb73dca6b50ff0c.tar.gz gcc-ec6d1fc09faea4a6be4df74babb73dca6b50ff0c.tar.bz2 | |
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 <iain@sandoe.co.uk>
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/m2/gm2-libs-ch/UnixArgs.cc | 5 | ||||
| -rw-r--r-- | gcc/m2/gm2-libs-ch/dtoa.cc | 5 | ||||
| -rw-r--r-- | gcc/m2/gm2-libs-ch/ldtoa.cc | 5 |
3 files changed, 6 insertions, 9 deletions
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); |