a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
98 lines
3.2 KiB
Diff
98 lines
3.2 KiB
Diff
From 060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52 Mon Sep 17 00:00:00 2001
|
|
From: Boris Kolpackov <boris@codesynthesis.com>
|
|
Date: Wed, 17 Jun 2020 11:22:11 +0200
|
|
Subject: [PATCH] Adjust to changes in GCC 10
|
|
|
|
[Upstream: 060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52]
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
odb/gcc.hxx | 7 +++++--
|
|
odb/parser.cxx | 8 ++++----
|
|
odb/semantics/elements.cxx | 4 ++--
|
|
3 files changed, 11 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/odb/gcc.hxx b/odb/gcc.hxx
|
|
index 9b644d7..af0e2a0 100644
|
|
--- a/odb/gcc.hxx
|
|
+++ b/odb/gcc.hxx
|
|
@@ -151,10 +151,13 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];}
|
|
#define DECL_CHAIN(x) TREE_CHAIN(x)
|
|
#endif
|
|
|
|
-// In GCC 6, ANON_AGGRNAME_P became anon_aggrname_p().
|
|
+// In GCC 6 ANON_AGGRNAME_P became anon_aggrname_p().
|
|
+// In GCC 10 anon_aggrname_p() became IDENTIFIER_ANON_P.
|
|
//
|
|
#if BUILDING_GCC_MAJOR < 6
|
|
-# define anon_aggrname_p(X) ANON_AGGRNAME_P(X)
|
|
+# define IDENTIFIER_ANON_P(X) ANON_AGGRNAME_P(X)
|
|
+#elif BUILDING_GCC_MAJOR < 10
|
|
+# define IDENTIFIER_ANON_P(X) anon_aggrname_p(X)
|
|
#endif
|
|
|
|
// In GCC 9:
|
|
diff --git a/odb/parser.cxx b/odb/parser.cxx
|
|
index 69d9b28..58388c9 100644
|
|
--- a/odb/parser.cxx
|
|
+++ b/odb/parser.cxx
|
|
@@ -1103,14 +1103,14 @@ emit_type_decl (tree decl)
|
|
// says that in typedef struct {} S; S becomes struct's
|
|
// name.
|
|
//
|
|
- if (anon_aggrname_p (decl_name))
|
|
+ if (IDENTIFIER_ANON_P (decl_name))
|
|
{
|
|
tree d (TYPE_NAME (t));
|
|
|
|
if (d != NULL_TREE &&
|
|
!DECL_ARTIFICIAL (d) &&
|
|
DECL_NAME (d) != NULL_TREE &&
|
|
- !anon_aggrname_p (DECL_NAME (d)))
|
|
+ !IDENTIFIER_ANON_P (DECL_NAME (d)))
|
|
{
|
|
decl = d;
|
|
decl_name = DECL_NAME (decl);
|
|
@@ -1727,7 +1727,7 @@ create_type (tree t,
|
|
ts << "start anon/stub " << gcc_tree_code_name(tc) << " at "
|
|
<< file << ":" << line << endl;
|
|
|
|
- if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d)))
|
|
+ if (d == NULL_TREE || IDENTIFIER_ANON_P (DECL_NAME (d)))
|
|
{
|
|
if (tc == RECORD_TYPE)
|
|
r = &emit_class<class_> (t, file, line, clmn);
|
|
@@ -1824,7 +1824,7 @@ create_type (tree t,
|
|
ts << "start anon/stub " << gcc_tree_code_name(tc) << " at "
|
|
<< file << ":" << line << endl;
|
|
|
|
- if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d)))
|
|
+ if (d == NULL_TREE || IDENTIFIER_ANON_P (DECL_NAME (d)))
|
|
{
|
|
r = &emit_enum (t, access, file, line, clmn);
|
|
}
|
|
diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx
|
|
index f937f54..2d266cf 100644
|
|
--- a/odb/semantics/elements.cxx
|
|
+++ b/odb/semantics/elements.cxx
|
|
@@ -75,7 +75,7 @@ namespace semantics
|
|
if (tree decl = TYPE_NAME (n))
|
|
name = DECL_NAME (decl);
|
|
|
|
- return name != 0 && anon_aggrname_p (name);
|
|
+ return name != 0 && IDENTIFIER_ANON_P (name);
|
|
}
|
|
|
|
return true;
|
|
@@ -124,7 +124,7 @@ namespace semantics
|
|
if (tree decl = TYPE_NAME (type))
|
|
{
|
|
name = DECL_NAME (decl);
|
|
- if (name != 0 && anon_aggrname_p (name))
|
|
+ if (name != 0 && IDENTIFIER_ANON_P (name))
|
|
return true;
|
|
|
|
tree s (CP_DECL_CONTEXT (decl));
|
|
--
|
|
2.26.2
|
|
|