JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygtls.h (_cygtls::retaddr): New method.

Browse Source 
* dll_init.cc (cygwin_detach_dll): Use new tls function to find return address
since this function is now signal guarded.
(update_envptrs): Remove unneeded braces.
* syscalls.cc (statvfs): Coerce full_path to avoid a gcc warning.
This commit is contained in:
Christopher Faylor 2006-03-08 23:55:14 +00:00
parent 6ca5318940
commit 9aca6a48a5
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2006-03-08 Christopher Faylor <cgf@timesys.com>
* cygtls.h (_cygtls::retaddr): New method.
* dll_init.cc (cygwin_detach_dll): Use new tls method to find return
address since this function is now signal guarded.
(update_envptrs): Remove unneeded braces.
* syscalls.cc (statvfs): Coerce full_path to avoid a gcc warning.
2006-03-08 Corinna Vinschen <corinna@vinschen.de> 2006-03-08 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (statvfs): Simplify path name expression. * syscalls.cc (statvfs): Simplify path name expression.

1
winsup/cygwin/cygtls.h
View File

@ -183,6 +183,7 @@ struct _cygtls
void remove (DWORD); void remove (DWORD);
void push (__stack_t) __attribute__ ((regparm (2))); void push (__stack_t) __attribute__ ((regparm (2)));
__stack_t pop () __attribute__ ((regparm (1))); __stack_t pop () __attribute__ ((regparm (1)));
__stack_t retaddr () {return stackptr[-1];}
bool isinitialized () const {return initialized == CYGTLS_INITIALIZED;} bool isinitialized () const {return initialized == CYGTLS_INITIALIZED;}
bool interrupt_now (CONTEXT *, int, void *, struct sigaction&) bool interrupt_now (CONTEXT *, int, void *, struct sigaction&)
__attribute__((regparm(3))); __attribute__((regparm(3)));

7
winsup/cygwin/dll_init.cc
View File

@ -1,6 +1,6 @@
/* dll_init.cc /* dll_init.cc
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc. Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
This software is a copyrighted work licensed under the terms of the This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for Cygwin license. Please consult the file "CYGWIN_LICENSE" for
@ -18,6 +18,7 @@ details. */
#include "dtable.h" #include "dtable.h"
#include "cygheap.h" #include "cygheap.h"
#include "pinfo.h" #include "pinfo.h"
#include "cygtls.h"
extern void __stdcall check_sanity_and_sync (per_process *); extern void __stdcall check_sanity_and_sync (per_process *);
@ -403,7 +404,7 @@ dll_noncygwin_dllcrt0 (HMODULE h, per_process *p)
extern "C" void extern "C" void
cygwin_detach_dll (dll *) cygwin_detach_dll (dll *)
{ {
dlls.detach (__builtin_return_address (0)); dlls.detach ((HANDLE) _my_tls.retaddr ());
} }
extern "C" void extern "C" void
@ -420,8 +421,6 @@ update_envptrs ()
{ {
extern char ***main_environ; extern char ***main_environ;
for (dll *d = dlls.istart (DLL_ANY); d; d = dlls.inext ()) for (dll *d = dlls.istart (DLL_ANY); d; d = dlls.inext ())
{
*(d->p.envptr) = __cygwin_environ; *(d->p.envptr) = __cygwin_environ;
}
*main_environ = __cygwin_environ; *main_environ = __cygwin_environ;
} }

4
winsup/cygwin/syscalls.cc
View File

@ -1850,14 +1850,14 @@ statvfs (const char *fname, struct statvfs *sfs)
OPEN_EXISTING, OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS, NULL); FILE_FLAG_BACKUP_SEMANTICS, NULL);
if (hdl == INVALID_HANDLE_VALUE) if (hdl == INVALID_HANDLE_VALUE)
debug_printf ("CreateFile (%s) failed, %E", full_path); debug_printf ("CreateFile (%s) failed, %E", (char *) full_path);
else else
{ {
NTFS_VOLUME_DATA_BUFFER nvdb; NTFS_VOLUME_DATA_BUFFER nvdb;
DWORD bytes; DWORD bytes;
if (!DeviceIoControl (hdl, FSCTL_GET_NTFS_VOLUME_DATA, NULL, if (!DeviceIoControl (hdl, FSCTL_GET_NTFS_VOLUME_DATA, NULL,
0, &nvdb, sizeof nvdb, &bytes, NULL)) 0, &nvdb, sizeof nvdb, &bytes, NULL))
debug_printf ("DeviceIoControl (%s) failed, %E", full_path); debug_printf ("DeviceIoControl (%s) failed, %E", (char *) full_path);
else else
totalc = nvdb.TotalClusters.QuadPart; totalc = nvdb.TotalClusters.QuadPart;
CloseHandle (hdl); CloseHandle (hdl);