* dlfcn.cc (dlopen): Disable old 32 bit code on 64 bit.

* dcrt0.cc (check_sanity_and_sync): Ditto.
	* dll_init.cc (dll_dllcrt0_1): Fix typo in comment.
This commit is contained in:
Corinna Vinschen
2014-10-10 15:29:18 +00:00
parent 7a84e9c4bc
commit 3ab591cf71
4 changed files with 13 additions and 1 deletions

View File

@@ -393,11 +393,13 @@ check_sanity_and_sync (per_process *p)
api_fatal ("cygwin DLL and APP are out of sync -- API version mismatch %u > %u",
p->api_major, cygwin_version.api_major);
#ifndef __x86_64__
/* This is a kludge to work around a version of _cygwin_common_crt0
which overwrote the cxx_malloc field with the local DLL copy.
Hilarity ensues if the DLL is not loaded while the process
is forking. */
__cygwin_user_data.cxx_malloc = &default_cygwin_cxx_malloc;
#endif
}
child_info NO_COPY *child_proc_info;