KJ16609/gcc-reflection
1
0
Fork 0
mirror of https://forge.sourceware.org/marek/gcc.git synced 2026-02-22 12:00:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

modula-2: Fix registration of modules via constructors [PR108183].

Browse Source 
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.
This commit is contained in:
Iain Sandoe
2022-12-30 19:46:13 +00:00
parent 751c2d9a46
commit ec6d1fc09f
16 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/m2/gm2-libs-ch/UnixArgs.cc
View File

@@ -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);

5
gcc/m2/gm2-libs-ch/dtoa.cc
View File

@@ -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);

5
gcc/m2/gm2-libs-ch/ldtoa.cc
View File

@@ -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);

5
libgm2/libm2cor/KeyBoardLEDs.cc
View File

@@ -148,9 +148,8 @@ _M2_KeyBoardLEDs_dep (void)
{
}
struct _M2_KeyBoardLEDs_ctor { _M2_KeyBoardLEDs_ctor (); } _M2_KeyBoardLEDs_ctor;
_M2_KeyBoardLEDs_ctor::_M2_KeyBoardLEDs_ctor (void)
extern "C" void __attribute__((__constructor__))
_M2_KeyBoardLEDs_ctor (void)
{
M2RTS_RegisterModule ("KeyBoardLEDs", _M2_KeyBoardLEDs_init, _M2_KeyBoardLEDs_finish,
_M2_KeyBoardLEDs_dep);

5
libgm2/libm2iso/ErrnoCategory.cc
View File

@@ -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);

5
libgm2/libm2iso/RTco.cc
View File

@@ -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);

5
libgm2/libm2pim/Selective.cc
View File

@@ -310,9 +310,8 @@ _M2_Selective_dep (void)
{
}
struct _M2_Selective_ctor { _M2_Selective_ctor (); } _M2_Selective_ctor;
_M2_Selective_ctor::_M2_Selective_ctor (void)
extern "C" void __attribute__((__constructor__))
_M2_Selective_ctor (void)
{
M2RTS_RegisterModule ("Selective", _M2_Selective_init, _M2_Selective_fini,
_M2_Selective_dep);

5
libgm2/libm2pim/SysExceptions.cc
View File

@@ -250,9 +250,8 @@ _M2_SysExceptions_dep (void)
{
}
struct _M2_SysExceptions_ctor { _M2_SysExceptions_ctor (); } _M2_SysExceptions_ctor;
_M2_SysExceptions_ctor::_M2_SysExceptions_ctor (void)
extern "C" void __attribute__((__constructor__))
_M2_SysExceptions_ctor (void)
{
M2RTS_RegisterModule ("SysExceptions", _M2_SysExceptions_init, _M2_SysExceptions_fini,
_M2_SysExceptions_dep);

5
libgm2/libm2pim/UnixArgs.cc
View File

@@ -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_fini,
_M2_UnixArgs_dep);

5
libgm2/libm2pim/cgetopt.cc
View File

@@ -149,9 +149,8 @@ _M2_cgetopt_dep (void)
{
}
struct _M2_cgetopt_ctor { _M2_cgetopt_ctor (); } _M2_cgetopt_ctor;
_M2_cgetopt_ctor::_M2_cgetopt_ctor (void)
extern "C" void __attribute__((__constructor__))
_M2_cgetopt_ctor (void)
{
M2RTS_RegisterModule ("cgetopt", _M2_cgetopt_init, _M2_cgetopt_fini,
_M2_cgetopt_dep);

5
libgm2/libm2pim/dtoa.cc
View File

@@ -255,9 +255,8 @@ _M2_dtoa_dep (void)
{
}
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_fini,
_M2_dtoa_dep);

5
libgm2/libm2pim/errno.cc
View File

@@ -61,9 +61,8 @@ _M2_errno_dep (void)
{
}
struct _M2_errno_ctor { _M2_errno_ctor (); } _M2_errno_ctor;
_M2_errno_ctor::_M2_errno_ctor (void)
extern "C" void __attribute__((__constructor__))
_M2_errno_ctor (void)
{
M2RTS_RegisterModule ("errno", _M2_errno_init, _M2_errno_fini,
_M2_errno_dep);

5
libgm2/libm2pim/ldtoa.cc
View File

@@ -180,9 +180,8 @@ _M2_ldtoa_dep (void)
{
}
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_fini,
_M2_ldtoa_dep);

5
libgm2/libm2pim/sckt.cc
View File

@@ -421,9 +421,8 @@ _M2_sckt_dep (void)
{
}
struct _M2_sckt_ctor { _M2_sckt_ctor (); } _M2_sckt_ctor;
_M2_sckt_ctor::_M2_sckt_ctor (void)
extern "C" void __attribute__((__constructor__))
_M2_sckt_ctor (void)
{
M2RTS_RegisterModule ("sckt", _M2_sckt_init, _M2_sckt_finish,
_M2_sckt_dep);

5
libgm2/libm2pim/termios.cc
View File

@@ -1978,9 +1978,8 @@ _M2_termios_dep (void)
{
}
struct _M2_termios_ctor { _M2_termios_ctor (); } _M2_termios_ctor;
_M2_termios_ctor::_M2_termios_ctor (void)
extern "C" void __attribute__((__constructor__))
_M2_termios_ctor (void)
{
M2RTS_RegisterModule ("termios", _M2_termios_init, _M2_termios_fini,
_M2_termios_dep);

1
libgm2/libm2pim/wrapc.c
View File

@@ -294,3 +294,4 @@ void
_M2_wrapc_ctor ()
{
}