From: H.J. Lu Date: Fri, 1 Jun 2018 16:38:22 +0000 (-0700) Subject: Move gdb/common/diagnostics.h to include/diagnostics.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e9cb46ab59ff2ea94a7fd9fa857a084d3a9b8b39;p=binutils-gdb.git 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 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/common/diagnostics.h b/gdb/common/diagnostics.h deleted file mode 100644 index e631f506de8..00000000000 --- a/gdb/common/diagnostics.h +++ /dev/null @@ -1,64 +0,0 @@ -/* 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 - (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 COMMON_DIAGNOSTICS_H -#define COMMON_DIAGNOSTICS_H - -#include "common/preprocessor.h" - -#ifdef __GNUC__ -# define DIAGNOSTIC_PUSH _Pragma ("GCC diagnostic push") -# define DIAGNOSTIC_POP _Pragma ("GCC diagnostic pop") -# define DIAGNOSTIC_IGNORE(option) \ - _Pragma (STRINGIFY (GCC diagnostic ignored option)) -#else -# define DIAGNOSTIC_PUSH -# define DIAGNOSTIC_POP -# define DIAGNOSTIC_IGNORE(option) -#endif - -#if defined (__clang__) /* clang */ - -# define DIAGNOSTIC_IGNORE_SELF_MOVE DIAGNOSTIC_IGNORE ("-Wself-move") -# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER \ - DIAGNOSTIC_IGNORE ("-Wdeprecated-register") -# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION \ - DIAGNOSTIC_IGNORE ("-Wunused-function") -# if __has_warning ("-Wenum-compare-switch") -# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES \ - DIAGNOSTIC_IGNORE ("-Wenum-compare-switch") -# else -# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES -# endif -#elif defined (__GNUC__) /* GCC */ - -# define DIAGNOSTIC_IGNORE_SELF_MOVE -# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER -# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION \ - DIAGNOSTIC_IGNORE ("-Wunused-function") -# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES - -#else /* Other compilers */ - -# define DIAGNOSTIC_IGNORE_SELF_MOVE -# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER -# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION -# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES - -#endif - -#endif /* COMMON_DIAGNOSTICS_H */ 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/include/diagnostics.h b/include/diagnostics.h new file mode 100644 index 00000000000..0725664177f --- /dev/null +++ b/include/diagnostics.h @@ -0,0 +1,60 @@ +/* Copyright (C) 2017-2018 Free Software Foundation, Inc. + + 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 DIAGNOSTICS_H +#define DIAGNOSTICS_H + +#ifdef __GNUC__ +# define DIAGNOSTIC_PUSH _Pragma ("GCC diagnostic push") +# define DIAGNOSTIC_POP _Pragma ("GCC diagnostic pop") +# define DIAGNOSTIC_IGNORE(option) \ + _Pragma (STRINGIFY (GCC diagnostic ignored option)) +#else +# define DIAGNOSTIC_PUSH +# define DIAGNOSTIC_POP +# define DIAGNOSTIC_IGNORE(option) +#endif + +#if defined (__clang__) /* clang */ + +# define DIAGNOSTIC_IGNORE_SELF_MOVE DIAGNOSTIC_IGNORE ("-Wself-move") +# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER \ + DIAGNOSTIC_IGNORE ("-Wdeprecated-register") +# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION \ + DIAGNOSTIC_IGNORE ("-Wunused-function") +# if __has_warning ("-Wenum-compare-switch") +# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES \ + DIAGNOSTIC_IGNORE ("-Wenum-compare-switch") +# else +# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES +# endif +#elif defined (__GNUC__) /* GCC */ + +# define DIAGNOSTIC_IGNORE_SELF_MOVE +# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER +# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION \ + DIAGNOSTIC_IGNORE ("-Wunused-function") +# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES + +#else /* Other compilers */ + +# define DIAGNOSTIC_IGNORE_SELF_MOVE +# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER +# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION +# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES + +#endif + +#endif /* DIAGNOSTICS_H */