From patchwork Mon Dec 24 21:51:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 30833 Received: (qmail 16917 invoked by alias); 24 Dec 2018 21:51:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 16906 invoked by uid 89); 24 Dec 2018 21:51:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.46.234) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Dec 2018 21:51:30 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway22.websitewelcome.com (Postfix) with ESMTP id B9E583B65 for ; Mon, 24 Dec 2018 15:51:28 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id bY8GgUKc52PzObY8GgD9Ls; Mon, 24 Dec 2018 15:51:28 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cj6UsRpNMOlqM3WAyywPU3BJNOjZXPl6RJ+ztl/c8Zs=; b=NpKUT9wpkhI5C30cX6lVK7tdkQ QyCVnSPXHx5x/CPJl2OurKnzZjgxO9PHOsbrIyKIz7KdSJ+MpQUB0u6ZOhMlgQ0zkyZnNt2AMOovb 5XMWluP4gRe5oYwNcLTPS9Aip; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:50702 helo=bapiya) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gbY8G-002zHk-EH; Mon, 24 Dec 2018 15:51:28 -0600 From: Tom Tromey To: Tom Tromey Cc: Svante Signell , Andreas Schwab , Simon Marchi , gdb-patches@sourceware.org Subject: Re: [PATCH] Please define thread_info as struct thread_info (and other stuff) References: <000db1d81a0c415190b6648222ed29db7f927df9.camel@gmail.com> <87d0q13w6b.fsf@tromey.com> <878t0j4ykk.fsf@tromey.com> Date: Mon, 24 Dec 2018 14:51:27 -0700 In-Reply-To: <878t0j4ykk.fsf@tromey.com> (Tom Tromey's message of "Thu, 20 Dec 2018 15:34:35 -0700") Message-ID: <87r2e6pp9c.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.90 (gnu/linux) MIME-Version: 1.0 >>>>> "Tom" == Tom Tromey writes: Tom> I took a quick look at it and one question I have is whether Tom> nm-i386gnu.h really needs to include any of the headers it does. defs.h Tom> already includes unistd.h, and regcache.h should probably not be needed; Tom> and removing the mach includes would at least reduce the number of spots Tom> needing the "struct". Could you try removing these lines? Tom> Also I happened to notice that file declares gnu_target_pid_to_str -- Tom> but I didn't see a definition. So perhaps that could be removed as Tom> well. As John pointed out, the file seems not to be needed at all. Could you try this patch? I have no way to test it. Tom commit 86d2fb04c1890b381a24d3508087d11cc88388c8 Author: Tom Tromey Date: Mon Dec 24 14:49:27 2018 -0700 Attempt to fix Hurd build gdb/ChangeLog 2018-12-24 Tom Tromey * gnu-nat.c (THREAD_STATE_FLAVOR, THREAD_STATE_SIZE) (THREAD_STATE_SET_TRACED, THREAD_STATE_CLEAR_TRACED): Move definitions from nm-i386gnu.h. * configure.nat: Don't reference nm-i386gnu.h. * config/i386/nm-i386gnu.h: Remove. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 21731be98d..bc408fe748 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2018-12-24 Tom Tromey + + * gnu-nat.c (THREAD_STATE_FLAVOR, THREAD_STATE_SIZE) + (THREAD_STATE_SET_TRACED, THREAD_STATE_CLEAR_TRACED): Move + definitions from nm-i386gnu.h. + * configure.nat: Don't reference nm-i386gnu.h. + * config/i386/nm-i386gnu.h: Remove. + 2018-12-18 Tom Tromey * dwarf2read.c (dwarf2_find_containing_comp_unit): Don't take diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-i386gnu.h deleted file mode 100644 index 4b2ca907fd..0000000000 --- a/gdb/config/i386/nm-i386gnu.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Native-dependent definitions for Intel 386 running the GNU Hurd - Copyright (C) 1994-2018 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#ifndef NM_I386GNU_H -#define NM_I386GNU_H - -#include -#include -#include -#include "regcache.h" - -extern char *gnu_target_pid_to_str (int pid); - -/* Thread flavors used in re-setting the T bit. */ -#define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE -#define THREAD_STATE_SIZE i386_THREAD_STATE_COUNT -#define THREAD_STATE_SET_TRACED(state) \ - ((struct i386_thread_state *) (state))->efl |= 0x100 -#define THREAD_STATE_CLEAR_TRACED(state) \ - ((((struct i386_thread_state *) (state))->efl &= ~0x100), 1) - -#endif /* nm-i386gnu.h */ diff --git a/gdb/configure.nat b/gdb/configure.nat index 200b716924..aa6f9c5c4e 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -218,7 +218,6 @@ case ${gdb_host} in msg_U.o exc_request_U.o exc_request_S.o' HAVE_NATIVE_GCORE_HOST=1 - NAT_FILE='nm-i386gnu.h' MH_CFLAGS='-D_GNU_SOURCE' XM_CLIBS='-lshouldbeinlibc' diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index a886c2b80c..612815f8ae 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -81,6 +81,14 @@ extern "C" #include "msg_U.h" } +/* Thread flavors used in re-setting the T bit. */ +#define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE +#define THREAD_STATE_SIZE i386_THREAD_STATE_COUNT +#define THREAD_STATE_SET_TRACED(state) \ + ((struct i386_thread_state *) (state))->efl |= 0x100 +#define THREAD_STATE_CLEAR_TRACED(state) \ + ((((struct i386_thread_state *) (state))->efl &= ~0x100), 1) + static process_t proc_server = MACH_PORT_NULL; /* If we've sent a proc_wait_request to the proc server, the pid of the