From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id C523C395B062; Fri, 13 May 2022 12:38:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C523C395B062 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop system_wow64_directory and related code X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: ca313dd8f4ceb7673c1c2fffb7da2c7bb291da30 X-Git-Newrev: 24363cffefd2aa21050497398f4b8c874286bcba Message-Id: <20220513123857.C523C395B062@sourceware.org> Date: Fri, 13 May 2022 12:38:57 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 12:38:57 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D24363cffefd= 2aa21050497398f4b8c874286bcba commit 24363cffefd2aa21050497398f4b8c874286bcba Author: Corinna Vinschen Date: Mon Mar 7 12:20:00 2022 +0100 Cygwin: drop system_wow64_directory and related code =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/dcrt0.cc | 9 --------- winsup/cygwin/exceptions.cc | 6 ------ winsup/cygwin/globals.cc | 2 -- 3 files changed, 17 deletions(-) diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 030d99b51..17d3b6653 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -732,15 +732,6 @@ init_windows_system_directory () RtlInitCountedUnicodeString (&windows_directory_path, windows_directory_buf, (windows_directory_length + 4) * sizeof (WCHAR)); -#ifdef __i386__ - system_wow64_directory_length =3D - GetSystemWow64DirectoryW (system_wow64_directory, MAX_PATH); - if (system_wow64_directory_length) - { - system_wow64_directory[system_wow64_directory_length++] =3D L'\\'; - system_wow64_directory[system_wow64_directory_length] =3D L'\0'; - } -#endif /* __i386__ */ } } =20 diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index f946bed77..f6c390241 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -438,12 +438,6 @@ _cygtls::inside_kernel (CONTEXT *cx) checkdir +=3D 4; res =3D wcsncasecmp (windows_system_directory, checkdir, windows_system_directory_length) =3D=3D 0; -#ifdef __i386__ - if (!res && system_wow64_directory_length) - res =3D wcsncasecmp (system_wow64_directory, checkdir, - system_wow64_directory_length) =3D=3D 0; - -#endif } sigproc_printf ("pc %p, h %p, inside_kernel %d", cx->_GR(ip), h, res); # undef h diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc index d3a2e11a4..aad5d4259 100644 --- a/winsup/cygwin/globals.cc +++ b/winsup/cygwin/globals.cc @@ -23,8 +23,6 @@ HMODULE NO_COPY hntdll; LONG NO_COPY sigExeced; WCHAR windows_system_directory[MAX_PATH]; UINT windows_system_directory_length; -WCHAR system_wow64_directory[MAX_PATH]; -UINT system_wow64_directory_length; WCHAR windows_directory_buf[MAX_PATH]; PWCHAR windows_directory =3D windows_directory_buf + 4; UINT windows_directory_length;