OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cygming-crtbegin.c (deregister_frame_fn): Newly public. 

* config/i386/cygming-crtbegin.c (deregister_frame_fn): Newly public.
(__gcc_deregister_frame): Move logic to detect deregister function to...
(__gcc_register_frame): here, so it's consistent with the register logic.

From-SVN: r213009
This commit is contained in:
DJ Delorie 2014-07-24 12:41:01 -04:00 committed by DJ Delorie
parent 037e55737e
commit fabf71ba2c
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgcc/ChangeLog
View File

@ -1,3 +1,9 @@
2014-07-24 DJ Delorie <dj@redhat.com>
* config/i386/cygming-crtbegin.c (deregister_frame_fn): Newly public.
(__gcc_deregister_frame): Move logic to detect deregister function to...
(__gcc_register_frame): here, so it's consistent with the register logic.
2014-07-23 Nathan Sidwell <nathan@acm.org>
* libgcov-driver.c (set_gcov_list): Remove.

17
libgcc/config/i386/cygming-crtbegin.c
View File

@ -102,6 +102,7 @@ static struct object obj;
/* Handle of libgcc's DLL reference. */
HANDLE hmod_libgcc;
static void * (*deregister_frame_fn) (const void *) == NULL;
#endif
#if TARGET_USE_JCR_SECTION
@ -133,9 +134,14 @@ __gcc_register_frame (void)
hmod_libgcc = LoadLibrary (LIBGCC_SONAME);
register_frame_fn = (void (*) (const void *, struct object *))
GetProcAddress (h, "__register_frame_info");
deregister_frame_fn = (void* (*) (const void *))
GetProcAddress (h, "__deregister_frame_info");
}
else
{
register_frame_fn = __register_frame_info;
deregister_frame_fn = __deregister_frame_info;
}
else
register_frame_fn = __register_frame_info;
if (register_frame_fn)
register_frame_fn (__EH_FRAME_BEGIN__, &obj);
#endif
@ -161,13 +167,6 @@ void
__gcc_deregister_frame (void)
{
#if DWARF2_UNWIND_INFO
void * (*deregister_frame_fn) (const void *);
HANDLE h = GetModuleHandle (LIBGCC_SONAME);
if (h)
deregister_frame_fn = (void* (*) (const void *))
GetProcAddress (h, "__deregister_frame_info");
else
deregister_frame_fn = __deregister_frame_info;
if (deregister_frame_fn)
deregister_frame_fn (__EH_FRAME_BEGIN__);
if (hmod_libgcc)