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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 082a435de9cb9b279dd14de5bff3c93ed2283a89..f83e6aa65574171ae3311cc7345d640734ee0e55 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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  <brobecker@adacore.com>
 
        * breakpoint.c (breakpoint_re_set): Temporarily force language_mode

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index c83a619833b5aba863b0cad5d17799357caa2aba..621ebb2a95bb278e247ed6f7c1b46f3868857d1c 100644 (file)
--- 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 a66e8c7a48d2dcfdb22998a3fa70665ca525e2b5..31b7ebf9c10f39cfc5930c2065e18812ada9aa29 100644 (file)
--- 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 5693a3e28e435e9695b344549b9cddbb28269fe9..c8e2cd49015d3ebec46936f47ce21239503d0f32 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * diagnostics.h: Moved from ../gdb/common/diagnostics.h.
+
 2018-05-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
        * 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 e631f506de8cdb7e2437b9cb06d245543247ac87..0725664177f1dcc6ae5d41de53cedd3e5b4228da 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.  */
 
-#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 */