1From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001
2From: Boris Kolpackov <boris@codesynthesis.com>
3Date: Wed, 31 Mar 2021 10:45:21 +0200
4Subject: [PATCH] Adjust to changes in GCC 11
5
6[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad]
7Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
8---
9 odb/gcc.hxx | 20 ++++++++++++++++++++
10 1 file changed, 20 insertions(+)
11
12diff --git a/odb/gcc.hxx b/odb/gcc.hxx
13index fb6a1bf..d8ad590 100644
14--- a/odb/gcc.hxx
15+++ b/odb/gcc.hxx
16@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];}
17 // In GCC 9:
18 //
19 // INCLUDED_FROM     Became linemap_included_from_linemap().
20+//
21 // LAST_SOURCE_LINE  Was removed apparently as no longer used. Studying
22 //                   the line-map.h diff from 8.3 suggests that the old
23 //                   implementation should still work.
24@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map)
25
26 #endif
27
28+// In GCC 11:
29+//
30+// lookup_qualified_name() has a new interface.
31+//
32+// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN.
33+//
34+#if BUILDING_GCC_MAJOR >= 11
35+
36+inline tree
37+lookup_qualified_name (tree scope, tree name, bool type, bool complain)
38+{
39+  return lookup_qualified_name (
40+    scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain);
41+}
42+
43+#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl)
44+
45+#endif
46+
47 #endif // ODB_GCC_HXX
48--
492.34.1
50
51