diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-07-01 08:26:45 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-07-01 08:26:45 +0400 |
| commit | 72f8054fad05e3dce132498f37d04391bdc63e51 (patch) | |
| tree | 0cba5b9bce101b6d2b58f7977eb6bcfde7a48ac4 /winsup/cygwin | |
| parent | 8c6b7d8a1599235f05f06a4119ae95321a0de10f (diff) | |
* dcrt0.cc (_dll_crt0): Renamed from dll_crt0 ().
* winsup.h: Accomodate above change.
* cygwin.din: Ditto.
* lib/cygwin_crt0.c: Ditto.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/cygwin.din | 2 | ||||
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/lib/cygwin_crt0.c | 4 | ||||
| -rw-r--r-- | winsup/cygwin/winsup.h | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1542180a2..0321789fb 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +Sat Jul 1 00:24:04 2000 Christopher Faylor <cgf@cygnus.com> + + * dcrt0.cc (_dll_crt0): Renamed from dll_crt0 (). + * winsup.h: Accomodate above change. + * cygwin.din: Ditto. + * lib/cygwin_crt0.c: Ditto. + Fri Jun 30 23:21:40 2000 Christopher Faylor <cgf@cygnus.com> * Makefile.in: Use variables rather than configure constructs where diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din index f69659fdd..ed2fdcd91 100644 --- a/winsup/cygwin/cygwin.din +++ b/winsup/cygwin/cygwin.din @@ -124,7 +124,7 @@ difftime _difftime = difftime div _div = div -dll_crt0@0 +_dll_crt0@0 dll_crt0__FP11per_process cygwin_dll_init dll_dllcrt0 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 6cfc60820..ceec8db57 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -780,8 +780,8 @@ dll_crt0_1 () UPTR is a pointer to global data that lives on the libc side of the line [if one distinguishes the application from the dll]. */ -void __stdcall -dll_crt0 () +extern "C" void __stdcall +_dll_crt0 () { char zeros[sizeof (ciresrv->zero)] = {0}; @@ -864,7 +864,7 @@ dll_crt0 (per_process *uptr) /* Set the local copy of the pointer into the user space. */ if (uptr) *user_data = *uptr; - dll_crt0 (); + _dll_crt0 (); } extern "C" void *export_malloc (unsigned int); diff --git a/winsup/cygwin/lib/cygwin_crt0.c b/winsup/cygwin/lib/cygwin_crt0.c index deed1a054..f0656a171 100644 --- a/winsup/cygwin/lib/cygwin_crt0.c +++ b/winsup/cygwin/lib/cygwin_crt0.c @@ -11,7 +11,7 @@ details. */ #include <windows.h> #include "crt0.h" -extern void __stdcall dll_crt0 (void) __declspec (dllimport); +extern void __stdcall _dll_crt0 (void) __declspec (dllimport) __attribute ((noreturn)); /* for main module */ void @@ -20,5 +20,5 @@ cygwin_crt0 (MainFunc f) _cygwin_crt0_common (f); /* Jump into the dll. */ - dll_crt0 (); + _dll_crt0 (); } diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 714955a5a..56eb0792d 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -272,7 +272,7 @@ extern unsigned int signal_shift_subtract; /* cygwin .dll initialization */ void dll_crt0 (per_process *); -void __stdcall dll_crt0 () __asm__ ("dll_crt0"); +extern "C" void __stdcall _dll_crt0 () __asm__ ("dll_crt0"); /* dynamically loaded dll initialization */ extern "C" int dll_dllcrt0 (HMODULE, per_process*); |