From patchwork Tue May 9 10:07:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 20319 Received: (qmail 345 invoked by alias); 9 May 2017 10:07:27 -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 319 invoked by uid 89); 9 May 2017 10:07:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=triggers X-HELO: mail-wr0-f195.google.com Received: from mail-wr0-f195.google.com (HELO mail-wr0-f195.google.com) (209.85.128.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 09 May 2017 10:07:23 +0000 Received: by mail-wr0-f195.google.com with SMTP id v42so12249391wrc.3 for ; Tue, 09 May 2017 03:07:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=1UG6eqV8G19FgS6R6SPOUrqrgQzsBSERUp/VkBRj7sg=; b=aChQLPQ6yXE4YyxxGv3+1+SWR2/p6/Wg+A3pBZ+A+56MZJi97wUqoH+1SWAsle/oPQ ibFOBxGbx8nK7iMxa7APszvMZzWSc0UHi2FcbP1VeiXCX1u647r/jjOKqutimhHUk6wJ lT3TCBldtq5AVdsyxBWmHKstQc6OEuS03vwem4kBlZLapr2011eEAPFVaLih7fdt3DRe 33wja23U6tndas0VBSoRs/h6FMMvlWWooADqHZy0YsCtiFTM96FV/wBuvGb5A9I2+6dU 56j2bOiO0du/7NgcJuhyO7u8Xx+RN1oYHW1zw+qE+sj3/scJc+tI8k1aYYul59HUsZ4I zB+g== X-Gm-Message-State: AN3rC/5V6Hep+x2JC1DpMa2cVn4vmCIdh8OVbICOGiC5nnLHXCaegKA4 6uYUY2myyPeYsB2b X-Received: by 10.223.175.209 with SMTP id y17mr37887066wrd.77.1494324444435; Tue, 09 May 2017 03:07:24 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com ([194.214.185.158]) by smtp.gmail.com with ESMTPSA id o20sm14559219wro.61.2017.05.09.03.07.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 May 2017 03:07:24 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH] Move initialize_tdesc_mips* calls from mips-linux-nat.c to mips-linux-tdep.c Date: Tue, 9 May 2017 11:07:19 +0100 Message-Id: <1494324439-15918-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes Target description initialization should be called in -tdep.c, instead of -nat.c. Rebuild mips-linux native GDB. Regression test is not run. gdb: 2017-05-09 Yao Qi * mips-linux-nat.c: Move include features/mips*-linux.c to mips-linux-tdep.c. (_initialize_mips_linux_nat): Move initialize_tdesc_mips* calls to mips-linux-tdep.c. * mips-linux-tdep.c: Include features/mips*-linux.c (_initialize_mips_linux_tdep): Call initialize_tdesc_mips* functions. * mips-linux-tdep.h (tdesc_mips_linux): Declare. (tdesc_mips_dsp_linux, tdesc_mips64_linux): Declare. (tdesc_mips64_dsp_linux): Declare. --- gdb/mips-linux-nat.c | 11 ----------- gdb/mips-linux-tdep.c | 11 +++++++++++ gdb/mips-linux-tdep.h | 6 ++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c index 8041d84..1fd3365 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -38,11 +38,6 @@ #include "nat/mips-linux-watch.h" -#include "features/mips-linux.c" -#include "features/mips-dsp-linux.c" -#include "features/mips64-linux.c" -#include "features/mips64-dsp-linux.c" - #ifndef PTRACE_GET_THREAD_AREA #define PTRACE_GET_THREAD_AREA 25 #endif @@ -803,10 +798,4 @@ triggers a breakpoint or watchpoint."), linux_nat_add_target (t); linux_nat_set_new_thread (t, mips_linux_new_thread); - - /* Initialize the standard target descriptions. */ - initialize_tdesc_mips_linux (); - initialize_tdesc_mips_dsp_linux (); - initialize_tdesc_mips64_linux (); - initialize_tdesc_mips64_dsp_linux (); } diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index 57e75b5..dc34242 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -40,6 +40,11 @@ #include "xml-syscall.h" #include "gdb_signals.h" +#include "features/mips-linux.c" +#include "features/mips-dsp-linux.c" +#include "features/mips64-linux.c" +#include "features/mips64-dsp-linux.c" + static struct target_so_ops mips_svr4_so_ops; /* This enum represents the signals' numbers on the MIPS @@ -1774,4 +1779,10 @@ _initialize_mips_linux_tdep (void) GDB_OSABI_LINUX, mips_linux_init_abi); } + + /* Initialize the standard target descriptions. */ + initialize_tdesc_mips_linux (); + initialize_tdesc_mips_dsp_linux (); + initialize_tdesc_mips64_linux (); + initialize_tdesc_mips64_dsp_linux (); } diff --git a/gdb/mips-linux-tdep.h b/gdb/mips-linux-tdep.h index 407b577..cca4798 100644 --- a/gdb/mips-linux-tdep.h +++ b/gdb/mips-linux-tdep.h @@ -105,3 +105,9 @@ enum { /* Return 1 if MIPS_RESTART_REGNUM is usable. */ int mips_linux_restart_reg_p (struct gdbarch *gdbarch); + +/* Target descriptions. */ +extern struct target_desc *tdesc_mips_linux; +extern struct target_desc *tdesc_mips64_linux; +extern struct target_desc *tdesc_mips_dsp_linux; +extern struct target_desc *tdesc_mips64_dsp_linux;