From 99ddea76c5233a683842de23ff5ec67c2aca58f8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 29 May 2016 16:50:57 +0200
Subject: [PATCH] Temporarily disable ntdll-Thread_Stack patchset.

The patchset was initially added for 64-bit MSYS2, however it seems to
break various other applications. Disable it until a better solution is
found.
---
 patches/ntdll-Thread_Stack/definition |  1 +
 patches/patchinstall.sh               | 28 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/patches/ntdll-Thread_Stack/definition b/patches/ntdll-Thread_Stack/definition
index 44859cb7..f4581714 100644
--- a/patches/ntdll-Thread_Stack/definition
+++ b/patches/ntdll-Thread_Stack/definition
@@ -1,3 +1,4 @@
 Fixes: Use a separate stack when starting new threads
 Fixes: Ignore invalid exit_frame when exiting thread
 Depends: ntdll-ThreadTime
+Disabled: true
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 5e833fb2..228d1de4 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -240,7 +240,6 @@ patch_enable_all ()
 	enable_ntdll_SystemRecommendedSharedDataAlignment="$1"
 	enable_ntdll_SystemRoot_Symlink="$1"
 	enable_ntdll_ThreadTime="$1"
-	enable_ntdll_Thread_Stack="$1"
 	enable_ntdll_Threading="$1"
 	enable_ntdll_User_Shared_Data="$1"
 	enable_ntdll_WRITECOPY="$1"
@@ -901,9 +900,6 @@ patch_enable ()
 		ntdll-ThreadTime)
 			enable_ntdll_ThreadTime="$2"
 			;;
-		ntdll-Thread_Stack)
-			enable_ntdll_Thread_Stack="$2"
-			;;
 		ntdll-Threading)
 			enable_ntdll_Threading="$2"
 			;;
@@ -2170,13 +2166,6 @@ if test "$enable_ntdll_WRITECOPY" -eq 1; then
 	enable_ws2_32_WriteWatches=1
 fi
 
-if test "$enable_ntdll_Thread_Stack" -eq 1; then
-	if test "$enable_ntdll_ThreadTime" -gt 1; then
-		abort "Patchset ntdll-ThreadTime disabled, but ntdll-Thread_Stack depends on that."
-	fi
-	enable_ntdll_ThreadTime=1
-fi
-
 if test "$enable_ntdll_SystemRoot_Symlink" -eq 1; then
 	if test "$enable_ntdll_Exception" -gt 1; then
 		abort "Patchset ntdll-Exception disabled, but ntdll-SystemRoot_Symlink depends on that."
@@ -5307,23 +5296,6 @@ if test "$enable_ntdll_ThreadTime" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset ntdll-Thread_Stack
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	ntdll-ThreadTime
-# |
-# | Modified files:
-# |   *	dlls/ntdll/signal_i386.c, dlls/ntdll/signal_x86_64.c, dlls/ntdll/thread.c
-# |
-if test "$enable_ntdll_Thread_Stack" -eq 1; then
-	patch_apply ntdll-Thread_Stack/0001-ntdll-Use-a-separate-stack-when-starting-new-threads.patch
-	patch_apply ntdll-Thread_Stack/0002-ntdll-Ignore-invalid-exit_frame-when-exiting-thread.patch
-	(
-		echo '+    { "Sebastian Lackner", "ntdll: Use a separate stack when starting new threads.", 1 },';
-		echo '+    { "Sebastian Lackner", "ntdll: Ignore invalid exit_frame when exiting thread.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset ntdll-Threading
 # |
 # | Modified files: