Merge commit 'a5b4c21d' into thread-merge-2.16

diff --cc filter/decl.m4
Simple merge

diff --cc lib/attrs.h
Simple merge

diff --cc lib/birdlib.h
index 5f1d3c3c0b219499ab285de33211d339c85d3f4e,8852b609a61ee8ec7bfcc8c5c131658c370c656e..57149cc9369533f076fc85a21d0ec4c6a4252cd0
--- 1/lib/birdlib.h
--- 2/lib/birdlib.h
+++ b/lib/birdlib.h
@@@ -116,8 -77,17 +116,18 @@@ static inline int u64_cmp(u64 i1, u64 i
  #define PACKED __attribute__((packed))
  #define NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
  #define ALLOC_SIZE(...) __attribute__((alloc_size(__VA_ARGS__)))
 +#define CLEANUP(fun) __attribute__((cleanup(fun)))
  
+ #if __GNUC__ >= 10
+ #define ACCESS_READ(...) __attribute__((access(read_only, __VA_ARGS__)))
+ #define ACCESS_WRITE(...) __attribute__((access(write_only, __VA_ARGS__)))
+ #define ACCESS_RW(...) __attribute__((access(read_write, __VA_ARGS__)))
+ #else
+ #define ACCESS_READ(...)
+ #define ACCESS_WRITE(...)
+ #define ACCESS_RW(...)
+ #endif
+ 
  #define STATIC_ASSERT(EXP) _Static_assert(EXP, #EXP)
  #define STATIC_ASSERT_MSG(EXP,MSG) _Static_assert(EXP, MSG)
  

diff --cc lib/net.h
Simple merge