[PATCH 1/3] ada-lex: Ignore warnings about register keyword

Simon Marchi
2017-06-25T17:45:53Z

Some older versions of flex (such as the one shipped with macOS) generate
code that use the register keyword, which clang warns about. This patch
makes the compiler ignore those warnings for the portion of the code
generated by flex.

gdb/ChangeLog:

* common/diagnostics.h (DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER):
New macro.
* ada-lex.l: Ignore deprecated register warnings.
---
gdb/ada-lex.l | 9 +++++++++
gdb/common/diagnostics.h | 3 +++
2 files changed, 12 insertions(+)

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 0825290..098272f 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -41,6 +41,13 @@ POSEXP (e"+"?{NUM10})

%{

+#include "common/diagnostics.h"
+
+/* Some older versions of flex generate code that uses the "register" keyword,
+ which clang warns about. */
+DIAGNOSTIC_PUSH
+DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER
+
#define NUMERAL_WIDTH 256
#define LONGEST_SIGN ((ULONGEST) 1 << (sizeof(LONGEST) * HOST_CHAR_BIT - 1))

@@ -648,3 +655,5 @@ dummy_function ada_flex_use[] =
{
(dummy_function) yyunput
};
+
+DIAGNOSTIC_POP
diff --git a/gdb/common/diagnostics.h b/gdb/common/diagnostics.h
index 5a63bfd..35bacf2 100644
--- a/gdb/common/diagnostics.h
+++ b/gdb/common/diagnostics.h
@@ -33,8 +33,11 @@

#ifdef __clang__
# define DIAGNOSTIC_IGNORE_SELF_MOVE DIAGNOSTIC_IGNORE ("-Wself-move")
+# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER \
+ DIAGNOSTIC_IGNORE ("-Wdeprecated-register")
#else
# define DIAGNOSTIC_IGNORE_SELF_MOVE
+# define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER
#endif

#endif /* COMMON_DIAGNOSTICS_H */
--
2.7.4