From patchwork Mon May 21 12:15:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 27353 Received: (qmail 60138 invoked by alias); 21 May 2018 12:16:17 -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 60050 invoked by uid 89); 21 May 2018 12:16:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=flex, 2017-2018, 20172018 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mga01.intel.com Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 21 May 2018 12:16:02 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2018 05:15:57 -0700 X-ExtLoop1: 1 Received: from gnu-cfl-1.sc.intel.com ([172.25.70.237]) by orsmga006.jf.intel.com with ESMTP; 21 May 2018 05:15:57 -0700 From: "H.J. Lu" To: binutils@sourceware.org Cc: gdb-patches@sourceware.org Subject: [PATCH 1/3] Move gdb/common/diagnostics.h to include/diagnostics.h Date: Mon, 21 May 2018 05:15:55 -0700 Message-Id: <20180521121557.16535-1-hjl.tools@gmail.com> X-IsSubscribed: yes Move gdb/common/diagnostics.h to include/diagnostics.h so that it can be used in binutils. gdb/ * ada-lex.l: Include "diagnostics.h" instead of "common/diagnostics.h". * unittests/environ-selftests.c: Likewise. * common/diagnostics.h: Moved to ../include. include/ * diagnostics.h: Moved from ../gdb/common/diagnostics.h. --- gdb/ada-lex.l | 2 +- gdb/unittests/environ-selftests.c | 2 +- {gdb/common => include}/diagnostics.h | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) rename {gdb/common => include}/diagnostics.h (92%) diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index c83a619833..621ebb2a95 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -41,7 +41,7 @@ POSEXP (e"+"?{NUM10}) %{ -#include "common/diagnostics.h" +#include "diagnostics.h" /* Some old versions of flex generate code that uses the "register" keyword, which clang warns about. This was observed for example with flex 2.5.35, diff --git a/gdb/unittests/environ-selftests.c b/gdb/unittests/environ-selftests.c index a66e8c7a48..31b7ebf9c1 100644 --- a/gdb/unittests/environ-selftests.c +++ b/gdb/unittests/environ-selftests.c @@ -20,7 +20,7 @@ #include "defs.h" #include "selftest.h" #include "common/environ.h" -#include "common/diagnostics.h" +#include "diagnostics.h" static const char gdb_selftest_env_var[] = "GDB_SELFTEST_ENVIRON"; diff --git a/gdb/common/diagnostics.h b/include/diagnostics.h similarity index 92% rename from gdb/common/diagnostics.h rename to include/diagnostics.h index e631f506de..0725664177 100644 --- a/gdb/common/diagnostics.h +++ b/include/diagnostics.h @@ -1,7 +1,5 @@ /* Copyright (C) 2017-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 @@ -15,10 +13,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef COMMON_DIAGNOSTICS_H -#define COMMON_DIAGNOSTICS_H - -#include "common/preprocessor.h" +#ifndef DIAGNOSTICS_H +#define DIAGNOSTICS_H #ifdef __GNUC__ # define DIAGNOSTIC_PUSH _Pragma ("GCC diagnostic push") @@ -61,4 +57,4 @@ #endif -#endif /* COMMON_DIAGNOSTICS_H */ +#endif /* DIAGNOSTICS_H */