mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-01-11 04:24:31 +08:00
ec6d1fc09f
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.
91 lines
2.1 KiB
C++
91 lines
2.1 KiB
C++
/* UnixArgs.cc record argc, argv as global variables.
|
|
|
|
Copyright (C) 2009-2022 Free Software Foundation, Inc.
|
|
Contributed by Gaius Mulley <gaius.mulley@southwales.ac.uk>.
|
|
|
|
This file is part of GNU Modula-2.
|
|
|
|
GNU Modula-2 is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
GNU Modula-2 is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <config.h>
|
|
#include <m2rts.h>
|
|
|
|
|
|
extern "C" int UnixArgs_GetArgC (void);
|
|
extern "C" char **UnixArgs_GetArgV (void);
|
|
extern "C" char **UnixArgs_GetEnvV (void);
|
|
|
|
static int UnixArgs_ArgC;
|
|
static char **UnixArgs_ArgV;
|
|
static char **UnixArgs_EnvV;
|
|
|
|
|
|
/* GetArgC returns argc. */
|
|
|
|
extern "C" int
|
|
UnixArgs_GetArgC (void)
|
|
{
|
|
return UnixArgs_ArgC;
|
|
}
|
|
|
|
|
|
/* GetArgV returns argv. */
|
|
|
|
extern "C" char **
|
|
UnixArgs_GetArgV (void)
|
|
{
|
|
return UnixArgs_ArgV;
|
|
}
|
|
|
|
|
|
/* GetEnvV returns envv. */
|
|
|
|
extern "C" char **
|
|
UnixArgs_GetEnvV (void)
|
|
{
|
|
return UnixArgs_EnvV;
|
|
}
|
|
|
|
|
|
extern "C" void
|
|
_M2_UnixArgs_init (int argc, char *argv[], char *envp[])
|
|
{
|
|
UnixArgs_ArgC = argc;
|
|
UnixArgs_ArgV = argv;
|
|
UnixArgs_EnvV = envp;
|
|
}
|
|
|
|
extern "C" void
|
|
_M2_UnixArgs_fini (int argc, char *argv[], char *envp[])
|
|
{
|
|
}
|
|
|
|
extern "C" void
|
|
_M2_UnixArgs_dep (void)
|
|
{
|
|
}
|
|
|
|
extern "C" void __attribute__((__constructor__))
|
|
_M2_UnixArgs_ctor (void)
|
|
{
|
|
M2RTS_RegisterModule ("UnixArgs", _M2_UnixArgs_init, _M2_UnixArgs_fini,
|
|
_M2_UnixArgs_dep);
|
|
}
|