From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 0zDiMiALdmAvPQAAWB0awg (envelope-from ) for ; Tue, 13 Apr 2021 17:20:32 -0400 Received: by simark.ca (Postfix, from userid 112) id C1EE71F104; Tue, 13 Apr 2021 17:20:32 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=MAILING_LIST_MULTI, RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id EEE471E783 for ; Tue, 13 Apr 2021 17:20:31 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9422E39518B4; Tue, 13 Apr 2021 21:20:31 +0000 (GMT) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by sourceware.org (Postfix) with ESMTPS id 68FBF394D8B3 for ; Tue, 13 Apr 2021 21:20:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 68FBF394D8B3 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=alves.ped@gmail.com Received: by mail-wr1-f53.google.com with SMTP id s7so17690675wru.6 for ; Tue, 13 Apr 2021 14:20:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wjOQomOw5v6qv/toIPkWTNwM08/xUuIlZRLCCCLLj3U=; b=hnfPalLyW7tRDTmSBWyvzpVEr9rqxlSbYsG1qFJBb3MMaju2oLY4eEE7cGBYQfa+bA huI8hxnwjfEbKUx4y4NZMZbyaAnj1l5N8Pmb4qDWpLdoYk3f8HODVyR0WwkiC8MjwqRW n+ly60AXHcUDs7+Wv6tv87ay8woeCW6AjlRIu9W3q/OU0IOiziKBCDkxqJZe3yQ56z9F I6iAajLzMpmpTgCIwimBDHaidrD1YNU/hdKY2AlqxQToSDRjj60c+dIpdweglKB9NKiV UejKTlw92vBVIMamrnpzVLfh+HQsv17AIqaFGsqGc5ZrGKv4S8DerZPilJRGCs5jZfHt uLBg== X-Gm-Message-State: AOAM5310FqTaQuA2917nt/uJBpOgiaAvDFkpXU22/OoC3fElc0Ea2z5j S1b2hGQnH1kKE+mi9jS3gP2eggT1u/Y5mA== X-Google-Smtp-Source: ABdhPJx2Ueuka0VjyIjOJh/j3VBs8SbnEB6HD+QXCAcakPYP2Jkp5dJ16v8NIkL7UznznKSC6GrCIA== X-Received: by 2002:adf:dd49:: with SMTP id u9mr21962374wrm.337.1618348827861; Tue, 13 Apr 2021 14:20:27 -0700 (PDT) Received: from ?IPv6:2001:8a0:f932:6a00:6b6e:c7b6:c5a7:aac3? ([2001:8a0:f932:6a00:6b6e:c7b6:c5a7:aac3]) by smtp.gmail.com with ESMTPSA id d133sm3505851wmf.9.2021.04.13.14.20.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 13 Apr 2021 14:20:26 -0700 (PDT) Subject: [pushed] Remove WinCE code from gdbreplay From: Pedro Alves To: Tom Tromey , Simon Marchi via Gdb-patches References: <20210410231021.1232451-1-simon.marchi@polymtl.ca> <874kgahtks.fsf@tromey.com> <912a95eb-0473-cf7d-19bb-157bedb158a6@palves.net> Message-ID: <8be268b4-14dd-23ba-bab2-a32d5e20abd2@palves.net> Date: Tue, 13 Apr 2021 22:20:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <912a95eb-0473-cf7d-19bb-157bedb158a6@palves.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" On 13/04/21 22:14, Pedro Alves wrote: > On 13/04/21 20:29, Tom Tromey wrote: >>>>>>> "Simon" == Simon Marchi via Gdb-patches writes: >> >> Simon> The support for WinCE was removed with commit 84b300de3666 ("gdbserver: >> Simon> remove support for ARM/WinCE"). There is some leftover code for WinCE >> Simon> support, guarded by the _WIN32_WCE macro, which I didn't know of at the >> Simon> time. >> >> I found one more spot, let me know what you think of the appended. > > OK. Obvious, even. > I remembered to grep for MINGW32CE, and found some more in gdbreplay. I've pushed this. >From 6cacd44948d844b035b359a3d65f575c9d7d7aed Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 12 Apr 2021 20:23:54 +0100 Subject: [PATCH] Remove WinCE code from gdbreplay gdbserver/ChangeLog: * gdbreplay.c [__MINGW32CE__] (COUNTOF, errno, strerror): Remove. --- gdbserver/ChangeLog | 4 ++++ gdbserver/gdbreplay.cc | 51 ------------------------------------------ 2 files changed, 4 insertions(+), 51 deletions(-) diff --git a/gdbserver/gdbreplay.cc b/gdbserver/gdbreplay.cc index 864a31e58f7..3705e9bf45f 100644 --- a/gdbserver/gdbreplay.cc +++ b/gdbserver/gdbreplay.cc @@ -69,57 +69,6 @@ typedef int socklen_t; static int remote_desc_in; static int remote_desc_out; -#ifdef __MINGW32CE__ - -#ifndef COUNTOF -#define COUNTOF(STR) (sizeof (STR) / sizeof ((STR)[0])) -#endif - -#define errno (GetLastError ()) - -char * -strerror (DWORD error) -{ - static char buf[1024]; - WCHAR *msgbuf; - DWORD lasterr = GetLastError (); - DWORD chars = FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM - | FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, - error, - 0, /* Default language */ - (LPVOID)&msgbuf, - 0, - NULL); - if (chars != 0) - { - /* If there is an \r\n appended, zap it. */ - if (chars >= 2 - && msgbuf[chars - 2] == '\r' - && msgbuf[chars - 1] == '\n') - { - chars -= 2; - msgbuf[chars] = 0; - } - - if (chars > ((COUNTOF (buf)) - 1)) - { - chars = COUNTOF (buf) - 1; - msgbuf [chars] = 0; - } - - wcstombs (buf, msgbuf, chars + 1); - LocalFree (msgbuf); - } - else - sprintf (buf, "unknown win32 error (%ld)", error); - - SetLastError (lasterr); - return buf; -} - -#endif /* __MINGW32CE__ */ - static void sync_error (FILE *fp, const char *desc, int expect, int got) { base-commit: 1228cb9094f17c3b151bcb087dcdf2c1cb05ae13 -- 2.26.2