commit 50399c0115f670b6794fa77ca8e167d9b05d819c · pyrox.dev/nixpkgs

pkgs/os-specific/cygwin/newlib-cygwin/default.nix

···

       41
       41
        
             # declared. Backport of https://cygwin.com/cgit/newlib-cygwin/commit/?id=73600d68227e125af24b7de7c3fccbd4eb66ee03

     

       42
       42
        
             ./fix-winsize.patch

     

       43
       43
        
           ]

     

       44
       44
       +
           ++ lib.optional (!headersOnly) [

     

       45
       45
       +
             # https://cygwin.com/pipermail/cygwin-developers/2020-September/011970.html

     

       46
       46
       +
             # This is required for boost coroutines to work. After we get to the point

     

       47
       47
       +
             # where nix runs on cygwin, we can attempt to upstream this again.

     

       48
       48
       +
             ./store-tls-pointer-in-win32-tls.patch

     

       49
       49
       +
           ]

     

       44
       50
        
           # After cygwin hosted builds are working, we should upstream this

     

       45
       51
        
           ++ lib.optional (

     

       46
       52
        
             !headersOnly && stdenvNoLibc.hostPlatform != stdenvNoLibc.buildPlatform

+246

pkgs/os-specific/cygwin/newlib-cygwin/store-tls-pointer-in-win32-tls.patch

···

       1
       1
       +
       From f74059ffbcf53d8ff4db59ca9e7b07d58bd3e3c6 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: David McFarland <corngood@gmail.com>

     

       3
       3
       +
       Date: Fri, 4 Sep 2020 10:15:57 -0300

     

       4
       4
       +
       Subject: [PATCH] Cygwin: store tls pointer in win32 tls

     

       5
       5
       +
       

     

       6
       6
       +
       Use WIN32 TLS instead of stack-relative pointers for TLS. This allows windows

     

       7
       7
       +
       fibers and boost coroutines to be used without crashing whenever a syscall is

     

       8
       8
       +
       made from a fiber.

     

       9
       9
       +
       

     

       10
       10
       +
       NOTE: This should be submitted upstream, but there is a blocker first. In the

     

       11
       11
       +
       main branch there are conflicts with new ARM64 support. In addition to fixing

     

       12
       12
       +
       the conflicts, we should actually test whether ARM64 builds work too, first.

     

       13
       13
       +
       ---

     

       14
       14
       +
        winsup/cygwin/create_posix_thread.cc  |  2 ++

     

       15
       15
       +
        winsup/cygwin/cygtls.cc               | 15 +++++++++++++++

     

       16
       16
       +
        winsup/cygwin/dcrt0.cc                |  1 +

     

       17
       17
       +
        winsup/cygwin/fork.cc                 |  1 +

     

       18
       18
       +
        winsup/cygwin/include/cygwin/config.h |  2 +-

     

       19
       19
       +
        winsup/cygwin/init.cc                 | 12 ++++++++----

     

       20
       20
       +
        winsup/cygwin/local_includes/cygtls.h |  7 +++++--

     

       21
       21
       +
        winsup/cygwin/scripts/gendef          | 15 ++++++++++-----

     

       22
       22
       +
        8 files changed, 43 insertions(+), 12 deletions(-)

     

       23
       23
       +
       

     

       24
       24
       +
       diff --git a/winsup/cygwin/create_posix_thread.cc b/winsup/cygwin/create_posix_thread.cc

     

       25
       25
       +
       index 3fcd61707..85c1a8af3 100644

     

       26
       26
       +
       --- a/winsup/cygwin/create_posix_thread.cc

     

       27
       27
       +
       +++ b/winsup/cygwin/create_posix_thread.cc

     

       28
       28
       +
       @@ -52,6 +52,7 @@ pthread_wrapper (PVOID arg)

     

       29
       29
       +
          /* Set stack values in TEB */

     

       30
       30
       +
          PTEB teb = NtCurrentTeb ();

     

       31
       31
       +
          teb->Tib.StackBase = wrapper_arg.stackbase;

     

       32
       32
       +
       +  _set_tls();

     

       33
       33
       +
          teb->Tib.StackLimit = wrapper_arg.stacklimit ?: wrapper_arg.stackaddr;

     

       34
       34
       +
          /* Set DeallocationStack value.  If we have an application-provided stack,

     

       35
       35
       +
             we set DeallocationStack to NULL, so NtTerminateThread does not deallocate

     

       36
       36
       +
       @@ -250,6 +251,7 @@ create_new_main_thread_stack (PVOID &allocationbase)

     

       37
       37
       +
            return NULL;

     

       38
       38
       +
          NtCurrentTeb()->Tib.StackBase = ((PBYTE) allocationbase + stacksize);

     

       39
       39
       +
          NtCurrentTeb()->Tib.StackLimit = stacklimit;

     

       40
       40
       +
       +  _set_tls();

     

       41
       41
       +
          return ((PBYTE) allocationbase + stacksize - 16);

     

       42
       42
       +
        }

     

       43
       43
       +
        

     

       44
       44
       +
       diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc

     

       45
       45
       +
       index 13d133f47..d23f9b42a 100644

     

       46
       46
       +
       --- a/winsup/cygwin/cygtls.cc

     

       47
       47
       +
       +++ b/winsup/cygwin/cygtls.cc

     

       48
       48
       +
       @@ -17,6 +17,20 @@ details. */

     

       49
       49
       +
        #include "sigproc.h"

     

       50
       50
       +
        #include "exception.h"

     

       51
       51
       +
        

     

       52
       52
       +
       +extern DWORD cygtls_slot;

     

       53
       53
       +
       +

     

       54
       54
       +
       +void _set_tls(TEB *teb)

     

       55
       55
       +
       +{

     

       56
       56
       +
       +  TlsSetValue(cygtls_slot, teb->Tib.StackBase);

     

       57
       57
       +
       +}

     

       58
       58
       +
       +

     

       59
       59
       +
       +_cygtls* _current_tls()

     

       60
       60
       +
       +{

     

       61
       61
       +
       +  register void *ret;

     

       62
       62
       +
       +  __asm __volatile__ ("movl cygtls_slot(%%rip),%%r10d\nmovq %%gs:0x1480(,%%r10d,8),%0" : "=r" (ret) : : "r10");

     

       63
       63
       +
       +  return (_cygtls *) ((PBYTE) ret - __CYGTLS_PADSIZE__);

     

       64
       64
       +
       +}

     

       65
       65
       +
       +

     

       66
       66
       +
        /* Two calls to get the stack right... */

     

       67
       67
       +
        void

     

       68
       68
       +
        _cygtls::call (DWORD (*func) (void *, void *), void *arg)

     

       69
       69
       +
       @@ -25,6 +39,7 @@ _cygtls::call (DWORD (*func) (void *, void *), void *arg)

     

       70
       70
       +
          /* Initialize this thread's ability to respond to things like

     

       71
       71
       +
             SIGSEGV or SIGFPE. */

     

       72
       72
       +
          exception protect;

     

       73
       73
       +
       +  _set_tls();

     

       74
       74
       +
          _my_tls.call2 (func, arg, buf);

     

       75
       75
       +
        }

     

       76
       76
       +
        

     

       77
       77
       +
       diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc

     

       78
       78
       +
       index f4c09befd..e6ba488f2 100644

     

       79
       79
       +
       --- a/winsup/cygwin/dcrt0.cc

     

       80
       80
       +
       +++ b/winsup/cygwin/dcrt0.cc

     

       81
       81
       +
       @@ -462,6 +462,7 @@ child_info_fork::alloc_stack ()

     

       82
       82
       +
        	 StackBase in the child to be the same as in the parent, so that the

     

       83
       83
       +
        	 computation of _my_tls is correct. */

     

       84
       84
       +
              teb->Tib.StackBase = (PVOID) stackbase;

     

       85
       85
       +
       +      _set_tls(teb);

     

       86
       86
       +
            }

     

       87
       87
       +
        }

     

       88
       88
       +
        

     

       89
       89
       +
       diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc

     

       90
       90
       +
       index f88acdbbf..582f1a454 100644

     

       91
       91
       +
       --- a/winsup/cygwin/fork.cc

     

       92
       92
       +
       +++ b/winsup/cygwin/fork.cc

     

       93
       93
       +
       @@ -141,6 +141,7 @@ frok::child (volatile char * volatile here)

     

       94
       94
       +
        		myself->pid, myself->ppid, __builtin_frame_address (0));

     

       95
       95
       +
          sigproc_printf ("hParent %p, load_dlls %d", hParent, load_dlls);

     

       96
       96
       +
        

     

       97
       97
       +
       +  _set_tls();

     

       98
       98
       +
          /* Make sure threadinfo information is properly set up. */

     

       99
       99
       +
          if (&_my_tls != _main_tls)

     

       100
       100
       +
            {

     

       101
       101
       +
       diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h

     

       102
       102
       +
       index 2a7083278..21ce484cf 100644

     

       103
       103
       +
       --- a/winsup/cygwin/include/cygwin/config.h

     

       104
       104
       +
       +++ b/winsup/cygwin/include/cygwin/config.h

     

       105
       105
       +
       @@ -37,7 +37,7 @@ extern inline struct _reent *__getreent (void)

     

       106
       106
       +
        {

     

       107
       107
       +
          register char *ret;

     

       108
       108
       +
        #ifdef __x86_64__

     

       109
       109
       +
       -  __asm __volatile__ ("movq %%gs:8,%0" : "=r" (ret));

     

       110
       110
       +
       +  __asm __volatile__ ("movl cygtls_slot(%%rip),%%r10d\nmovq %%gs:0x1480(,%%r10d,8),%0" : "=r" (ret) : : "r10");

     

       111
       111
       +
        #else

     

       112
       112
       +
        #error unimplemented for this target

     

       113
       113
       +
        #endif

     

       114
       114
       +
       diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc

     

       115
       115
       +
       index ce6484aff..392ac8600 100644

     

       116
       116
       +
       --- a/winsup/cygwin/init.cc

     

       117
       117
       +
       +++ b/winsup/cygwin/init.cc

     

       118
       118
       +
       @@ -11,7 +11,7 @@ details. */

     

       119
       119
       +
        #include "ntdll.h"

     

       120
       120
       +
        #include "shared_info.h"

     

       121
       121
       +
        

     

       122
       122
       +
       -static DWORD _my_oldfunc;

     

       123
       123
       +
       +DWORD NO_COPY cygtls_slot;

     

       124
       124
       +
        

     

       125
       125
       +
        static char *search_for  = (char *) cygthread::stub;

     

       126
       126
       +
        unsigned threadfunc_ix[8];

     

       127
       127
       +
       @@ -22,7 +22,9 @@ static bool dll_finished_loading;

     

       128
       128
       +
        static void

     

       129
       129
       +
        threadfunc_fe (VOID *arg)

     

       130
       130
       +
        {

     

       131
       131
       +
       -  _cygtls::call ((DWORD (*)  (void *, void *)) TlsGetValue (_my_oldfunc), arg);

     

       132
       132
       +
       +  PVOID f = TlsGetValue (cygtls_slot);

     

       133
       133
       +
       +  _set_tls();

     

       134
       134
       +
       +  _cygtls::call ((DWORD (*)  (void *, void *)) f, arg);

     

       135
       135
       +
        }

     

       136
       136
       +
        

     

       137
       137
       +
        /* If possible, redirect the thread entry point to a cygwin routine which

     

       138
       138
       +
       @@ -59,7 +61,7 @@ munge_threadfunc ()

     

       139
       139
       +
        	  for (i = 0; threadfunc_ix[i]; i++)

     

       140
       140
       +
        	    if (!threadfunc || ebp[threadfunc_ix[i]] == threadfunc)

     

       141
       141
       +
        	       ebp[threadfunc_ix[i]] = (char *) threadfunc_fe;

     

       142
       142
       +
       -	  TlsSetValue (_my_oldfunc, threadfunc);

     

       143
       143
       +
       +	  TlsSetValue (cygtls_slot, threadfunc);

     

       144
       144
       +
        	}

     

       145
       145
       +
            }

     

       146
       146
       +
        }

     

       147
       147
       +
       @@ -78,6 +80,8 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)

     

       148
       148
       +
          switch (reason)

     

       149
       149
       +
            {

     

       150
       150
       +
            case DLL_PROCESS_ATTACH:

     

       151
       151
       +
       +      cygtls_slot = TlsAlloc ();

     

       152
       152
       +
       +      _set_tls();

     

       153
       153
       +
              init_console_handler (false);

     

       154
       154
       +
        

     

       155
       155
       +
              cygwin_hmodule = (HMODULE) h;

     

       156
       156
       +
       @@ -94,7 +98,6 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)

     

       157
       157
       +
              memcpy (_REENT, _GLOBAL_REENT, sizeof (struct _reent));

     

       158
       158
       +
        

     

       159
       159
       +
              dll_crt0_0 ();

     

       160
       160
       +
       -      _my_oldfunc = TlsAlloc ();

     

       161
       161
       +
              dll_finished_loading = true;

     

       162
       162
       +
              break;

     

       163
       163
       +
            case DLL_PROCESS_DETACH:

     

       164
       164
       +
       @@ -102,6 +105,7 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)

     

       165
       165
       +
        	shared_destroy ();

     

       166
       166
       +
              break;

     

       167
       167
       +
            case DLL_THREAD_ATTACH:

     

       168
       168
       +
       +      _set_tls();

     

       169
       169
       +
              if (dll_finished_loading)

     

       170
       170
       +
        	munge_threadfunc ();

     

       171
       171
       +
              break;

     

       172
       172
       +
       diff --git a/winsup/cygwin/local_includes/cygtls.h b/winsup/cygwin/local_includes/cygtls.h

     

       173
       173
       +
       index 306497a33..e3a216280 100644

     

       174
       174
       +
       --- a/winsup/cygwin/local_includes/cygtls.h

     

       175
       175
       +
       +++ b/winsup/cygwin/local_includes/cygtls.h

     

       176
       176
       +
       @@ -301,8 +301,11 @@ private:

     

       177
       177
       +
        #include "cygerrno.h"

     

       178
       178
       +
        #include "ntdll.h"

     

       179
       179
       +
        

     

       180
       180
       +
       -#define _my_tls (*((_cygtls *) ((PBYTE) NtCurrentTeb()->Tib.StackBase \

     

       181
       181
       +
       -		                - __CYGTLS_PADSIZE__)))

     

       182
       182
       +
       +void _set_tls(TEB*);

     

       183
       183
       +
       +inline void _set_tls() { _set_tls(NtCurrentTeb()); }

     

       184
       184
       +
       +_cygtls* _current_tls();

     

       185
       185
       +
       +

     

       186
       186
       +
       +#define _my_tls (*_current_tls())

     

       187
       187
       +
        extern _cygtls *_main_tls;

     

       188
       188
       +
        extern _cygtls *_sig_tls;

     

       189
       189
       +
        

     

       190
       190
       +
       diff --git a/winsup/cygwin/scripts/gendef b/winsup/cygwin/scripts/gendef

     

       191
       191
       +
       index 861a2405b..9a4479bd8 100755

     

       192
       192
       +
       --- a/winsup/cygwin/scripts/gendef

     

       193
       193
       +
       +++ b/winsup/cygwin/scripts/gendef

     

       194
       194
       +
       @@ -118,7 +118,8 @@ EOF

     

       195
       195
       +
        	.seh_proc _sigfe_maybe

     

       196
       196
       +
        _sigfe_maybe:					# stack is aligned on entry!

     

       197
       197
       +
        	.seh_endprologue

     

       198
       198
       +
       -	movq	%gs:8,%r10			# location of bottom of stack

     

       199
       199
       +
       +	movl	cygtls_slot(%rip),%r10d

     

       200
       200
       +
       +	movq	%gs:0x1480(,%r10d,8),%r10	# location of bottom of stack

     

       201
       201
       +
        	leaq	_cygtls.initialized(%r10),%r11	# where we will be looking

     

       202
       202
       +
        	cmpq	%r11,%rsp			# stack loc > than tls

     

       203
       203
       +
        	jge	0f				# yep.  we don't have a tls.

     

       204
       204
       +
       @@ -131,7 +132,8 @@ _sigfe_maybe:					# stack is aligned on entry!

     

       205
       205
       +
        	.seh_proc _sigfe

     

       206
       206
       +
        _sigfe:						# stack is aligned on entry!

     

       207
       207
       +
        	.seh_endprologue

     

       208
       208
       +
       -	movq	%gs:8,%r10			# location of bottom of stack

     

       209
       209
       +
       +	movl	cygtls_slot(%rip),%r10d

     

       210
       210
       +
       +	movq	%gs:0x1480(,%r10d,8),%r10	# location of bottom of stack

     

       211
       211
       +
        1:	movl	\$1,%r11d

     

       212
       212
       +
        	xchgl	%r11d,_cygtls.stacklock(%r10)	# try to acquire lock

     

       213
       213
       +
        	testl	%r11d,%r11d			# it will be zero

     

       214
       214
       +
       @@ -154,7 +156,8 @@ _sigfe:						# stack is aligned on entry!

     

       215
       215
       +
        _sigbe:						# return here after cygwin syscall

     

       216
       216
       +
        						# stack is aligned on entry!

     

       217
       217
       +
        	.seh_endprologue

     

       218
       218
       +
       -	movq	%gs:8,%r10			# address of bottom of tls

     

       219
       219
       +
       +	movl	cygtls_slot(%rip),%r10d

     

       220
       220
       +
       +	movq	%gs:0x1480(,%r10d,8),%r10	# address of bottom of tls

     

       221
       221
       +
        1:	movl	\$1,%r11d

     

       222
       222
       +
        	xchgl	%r11d,_cygtls.stacklock(%r10)	# try to acquire lock

     

       223
       223
       +
        	testl	%r11d,%r11d			# it will be zero

     

       224
       224
       +
       @@ -249,7 +252,8 @@ sigdelayed:

     

       225
       225
       +
        2:

     

       226
       226
       +
        	.seh_endprologue

     

       227
       227
       +
        

     

       228
       228
       +
       -	movq	%gs:8,%r12			# get tls

     

       229
       229
       +
       +	movl	cygtls_slot(%rip),%r12d

     

       230
       230
       +
       +	movq	%gs:0x1480(,%r12d,8),%r12	# get tls

     

       231
       231
       +
        	movl	_cygtls.saved_errno(%r12),%r15d	# temporarily save saved_errno

     

       232
       232
       +
        	movq	\$_cygtls.start_offset,%rcx	# point to beginning of tls block

     

       233
       233
       +
        	addq	%r12,%rcx			#  and store as first arg to method

     

       234
       234
       +
       @@ -316,7 +320,8 @@ stabilize_sig_stack:

     

       235
       235
       +
        	subq	\$0x20,%rsp

     

       236
       236
       +
        	.seh_stackalloc 32

     

       237
       237
       +
        	.seh_endprologue

     

       238
       238
       +
       -	movq	%gs:8,%r12

     

       239
       239
       +
       +	movl	cygtls_slot(%rip),%r12d

     

       240
       240
       +
       +	movq	%gs:0x1480(,%r12d,8),%r12

     

       241
       241
       +
        1:	movl	\$1,%r10d

     

       242
       242
       +
        	xchgl	%r10d,_cygtls.stacklock(%r12)	# try to acquire lock

     

       243
       243
       +
        	testl	%r10d,%r10d

     

       244
       244
       +
       -- 

     

       245
       245
       +
       2.50.1

     

       246
       246
       +