diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-01-27 13:06:07 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-01-27 13:06:07 +0100 |
| commit | 21d11f4f30bb73b56d608398f670e251f9d0eae4 (patch) | |
| tree | fcf18c87170e90c3956fea51ba71005b902825c1 /gcc/ada/seh_init.c | |
| parent | ee13bdc7cb8b37372563c0c0ad9482c1249a6f26 (diff) | |
| download | gcc-21d11f4f30bb73b56d608398f670e251f9d0eae4.zip gcc-21d11f4f30bb73b56d608398f670e251f9d0eae4.tar.gz gcc-21d11f4f30bb73b56d608398f670e251f9d0eae4.tar.bz2 | |
[multiple changes]
2010-01-27 Tristan Gingold <gingold@adacore.com>
* seh_init.c: Use __ImageBase instead of _ImageBase.
2010-01-27 Javier Miranda <miranda@adacore.com>
* exp_disp.ads, exp_disp.adb (Expand_Interface_Thunk): Modify the
profile of interface thunks. The type of the controlling formal is now
the covered interface type (instead of the target tagged type).
From-SVN: r156280
Diffstat (limited to 'gcc/ada/seh_init.c')
| -rw-r--r-- | gcc/ada/seh_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/ada/seh_init.c b/gcc/ada/seh_init.c index 9edd882..012692a 100644 --- a/gcc/ada/seh_init.c +++ b/gcc/ada/seh_init.c @@ -248,7 +248,7 @@ void __gnat_install_SEH_handler (void *eh ATTRIBUTE_UNUSED) /* Get the end of the text section. */ extern char etext[] asm("etext"); /* Get the base of the module. */ - extern char _ImageBase[]; + extern char __ImageBase[]; /* Current version is always 1 and we are registering an exception handler. */ @@ -261,15 +261,15 @@ void __gnat_install_SEH_handler (void *eh ATTRIBUTE_UNUSED) /* Add the exception handler. */ unwind_info[0].AddressOfExceptionHandler = - (DWORD)((char *)__gnat_SEH_error_handler - _ImageBase); + (DWORD)((char *)__gnat_SEH_error_handler - __ImageBase); /* Set its scope to the entire program. */ Table[0].BeginAddress = 0; - Table[0].EndAddress = (DWORD)(etext - _ImageBase); - Table[0].UnwindData = (DWORD)((char *)unwind_info - _ImageBase); + Table[0].EndAddress = (DWORD)(etext - __ImageBase); + Table[0].UnwindData = (DWORD)((char *)unwind_info - __ImageBase); /* Register the unwind information. */ - RtlAddFunctionTable (Table, 1, (DWORD64)_ImageBase); + RtlAddFunctionTable (Table, 1, (DWORD64)__ImageBase); } #else /* defined (_WIN64) */ |