From e9cb46ab59ff2ea94a7fd9fa857a084d3a9b8b39 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 1 Jun 2018 09:38:22 -0700 Subject: [PATCH] Move gdb/common/diagnostics.h to include/diagnostics.h 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/ChangeLog | 7 +++++++ gdb/ada-lex.l | 2 +- gdb/unittests/environ-selftests.c | 2 +- include/ChangeLog | 4 ++++ {gdb/common => include}/diagnostics.h | 10 +++------- 5 files changed, 16 insertions(+), 9 deletions(-) rename {gdb/common => include}/diagnostics.h (92%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 082a435de9c..f83e6aa6557 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-06-01 H.J. Lu + + * ada-lex.l: Include "diagnostics.h" instead of + "common/diagnostics.h". + * unittests/environ-selftests.c: Likewise. + * common/diagnostics.h: Moved to ../include. + 2018-06-01 Joel Brobecker * breakpoint.c (breakpoint_re_set): Temporarily force language_mode diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index c83a619833b..621ebb2a95b 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 a66e8c7a48d..31b7ebf9c10 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/include/ChangeLog b/include/ChangeLog index 5693a3e28e4..c8e2cd49015 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2018-06-01 H.J. Lu + + * diagnostics.h: Moved from ../gdb/common/diagnostics.h. + 2018-05-28 Bernd Edlinger * splay-tree.h (splay_tree_compare_strings, 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 e631f506de8..0725664177f 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 */ -- 2.30.2