29d52c8a27
calculated mask in debugging output. * sigproc.h (set_signal_mask): Reflect above change in declaration. * path.cc (mount_item::build_win32): Take path apart before feeding it to fnmunge. Throughout, change use of _reent_winsup()-> to _my_tls.locals. instead. Throughout, remove obsolete MT_SAFE/_CYG_THREAD_FAILSAFE considerations. Througout, add cygtls.h include. * Makefile.in (DLL_OFILES): Add cygtls.o. Add some more objects to the -fomit-frame-pointer list. * acconfig.h: Remove obsolete settings. * config.h.in: Ditto. * bsdlib.cc: Add cygtls.h include. * configure.in: Remove --enable-extra-threadsafe-checking. * configure: Regenerate. * cygtls.h (_local_storage): New struct renamed from _winsup_t (sic). (_threadinfo:local_clib): Add new field. (_threadinfo::locals): Ditto. (_threadinfo::init_thread): Accept second _reent * argument. (_threadinfo::call): Define as regparm. (CYGTLS_PADSIZE): Remove unnecessary slop. (_getreent): Define as a macro. * thread.h: Remove _CYG_THREAD_FAILSAFE and MT_SAFE stuff. (_winsup_t): Move to cygtls.h. (ResourceLocks::ResourceLocks): Eliminate empty constructor. (MTinterface::reents): Eliminate. (MTinterface::thread_self_key): Eliminate. (MTinterface::MTinterface): Eliminate. * dcrt0.cc: Include stdio.h for _impure_ptr initialization. (do_global_ctors): Remove run_ctors_p (sic) considerations. Don't call atexit here. (__main): Initialize destructors for user here. (dll_crt0_1): Accept a dummy argument. Don't call init_thread here. Don't set _impure_ptr here. Call do_global_ctors after more things have been initialized. (_dll_crt0): Define zeros buffer as max of needed size of CYGTLS_PADSIZE so that it can be used for two purposes while minimizing stack usage. Initialize _impure_ptr specifically, for speed. Call dll_crt0_1 with buffer argument. (cygwin_dll_init): Call dll_crt0_1 with dummy argument. * dtable.cc (dtable::find_unused_handle): Remove call to AssertResourceOwner. * exceptions.cc: Move _threadinfo stuff to new file. * cygtls.cc: New file. * gentls_offsets: Accommodate increasing complexity of cygtls.h. * hires.h (hires_base::~hires_base): Remove. * init.cc (dll_entry): Remove setting of reents. * thread.cc: Remove syslog.h include. (__getreent): Simplify to use _my_tls. (_reent_winsup): Delete. (AssertResourceOwner): Delete. (MTinterface::Init): Remove setting of _clib and _winsup, with all that entails. (MTinterface::fixup_after_fork): Ditto. (pthread::thread_init_wrapper): Ditto. Also remove call to set_tls_self_pointer. (pthread::set_tls_self_pointer): Eliminate. (pthread::get_tls_self_pointer): Just return _my_tls.tid; (__reent_t::init_clib): Eliminate. * tlsoffsets.h: Regenerate.
80 lines
2.1 KiB
Perl
Executable File
80 lines
2.1 KiB
Perl
Executable File
#!/usr/bin/perl -s
|
|
my $tls = shift;
|
|
my $tls_out = shift;
|
|
open(TLS, $tls) or die "$0: couldn't open tls file \"$tls\" - $!\n";
|
|
my $struct = '';
|
|
my @fields = ();
|
|
my $def = '';
|
|
my $tls = join('', <TLS>);
|
|
$tls =~ s/\n[^\n]*gentls_offsets[^\n]*\n(.+)\Z/$1/os;
|
|
my $pre = $`;
|
|
substr($tls, 0, length($pre)) = '';
|
|
$pre =~ s/\n#ifndef _[^\n]+\n/\n/os;
|
|
$pre .= "\n//*/";
|
|
$tls =~ s%/\*\s*gentls_offsets.*?/\*\s*gentls_offsets\s*\*/%%ogs;
|
|
foreach ($tls =~ /^.*\n/mg) {
|
|
$def .= $_ if $struct;
|
|
last if /^};/o;
|
|
/^\s*typedef/o and do {
|
|
$def .= $_ ;
|
|
next;
|
|
};
|
|
if (!s/;.*$//o) {
|
|
if (!$struct && /^\s*(?:struct|class)\s*([a-z_0-9]+)/o) {
|
|
$def .= $_;
|
|
$struct = $1
|
|
}
|
|
next;
|
|
}
|
|
s/(?:\[[^\]]*\]|struct|class)//o;
|
|
s/^\s+\S+\s+//o;
|
|
s/[\*\s()]+//go;
|
|
for my $f (split(/,/)) {
|
|
push(@fields, $f);
|
|
}
|
|
}
|
|
close TLS;
|
|
open(TMP, '>', "/tmp/$$.cc") or die "$0: couldn't open temporary index file \"/tmp/$$.c\" - $!\n";
|
|
print TMP <<EOF;
|
|
#define __INSIDE_CYGWIN__
|
|
#define __attribute__(X)
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
typedef void *HANDLE;
|
|
$pre
|
|
$def
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
$struct foo[1];
|
|
# define foo_end ((char *) (foo + 1))
|
|
# define offset(f) (((char *) &(foo->f)) - foo_end)
|
|
EOF
|
|
print TMP 'puts ("//;# autogenerated: Do not edit.\n");', "\n\n";
|
|
for my $f (@fields) {
|
|
print TMP ' printf ("//; $tls::', $f, ' = %d;\n", ', "offset($f));\n";
|
|
}
|
|
print TMP ' puts ("//; __DATA__\n");', "\n";
|
|
for my $f (@fields) {
|
|
print TMP ' printf ("#define tls_', $f, ' (%d)\n", ', "offset($f));\n";
|
|
}
|
|
|
|
print TMP <<EOF;
|
|
|
|
exit (0);
|
|
}
|
|
EOF
|
|
close TMP;
|
|
system @ARGV, '-o', "/tmp/$$-1.cc", '-E', "/tmp/$$.cc";
|
|
system 'g++', '-o', "/tmp/$$.a.out", "/tmp/$$-1.cc" and
|
|
($? == 127 && system 'c++', '-o', "/tmp/$$.a.out", "/tmp/$$-1.cc") and
|
|
die "$0: couldn't generate executable for offset calculation \"/tmp/$$.a.out\" - $!\n";
|
|
open(TLS_OUT, '>', $tls_out) or die "$0: couldn't open tls index file \"tls_out\" - $!\n";
|
|
open(OFFS, "/tmp/$$.a.out|") or die "$0: couldn't run \"/tmp/$$.a.out\" - $!\n";
|
|
print TLS_OUT <OFFS>;
|
|
close OFFS;
|
|
close TLS_OUT;
|
|
# unlink "/tmp/$$.cc", "/tmp/$$.a.out";
|
|
exit(0);
|