From: Maria Matejka <mq@ucw.cz>
Date: Mon, 18 Jul 2022 08:19:59 +0000 (+0200)
Subject: Merge commit 'a845651b' into thread-next
X-Git-Tag: v3.0-alpha1~171^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=636ab95f44efee774343f711ec46e69c6bea4e81;p=thirdparty%2Fbird.git

Merge commit 'a845651b' into thread-next
---

636ab95f44efee774343f711ec46e69c6bea4e81
diff --cc .gitlab-ci.yml
index 7809fecd4,392020985..0a758cff4
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -310,23 -300,15 +300,15 @@@ build-fedora-33-amd64
  
  build-fedora-34-amd64:
    <<: *build-linux
 -  image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
 +  image: registry.nic.cz/labs/bird:fedora-33-amd64
  
- build-centos-7-amd64:
-   <<: *build-linux
-   image: registry.nic.cz/labs/bird:centos-7-amd64
- 
  build-centos-8-amd64:
    <<: *build-linux
 -  image: registry.labs.nic.cz/labs/bird:centos-8-amd64
 +  image: registry.nic.cz/labs/bird:centos-8-amd64
  
- build-ubuntu-14_04-amd64:
-   <<: *build-linux
-   image: registry.nic.cz/labs/bird:ubuntu-14.04-amd64
- 
  build-ubuntu-16_04-amd64:
    <<: *build-linux
 -  image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64
 +  image: registry.nic.cz/labs/bird:ubuntu-16.04-amd64
  
  build-ubuntu-18_04-amd64:
    <<: *build-linux
diff --cc lib/birdlib.h
index 25545fc37,2e642d384..bdf69309a
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@@ -14,24 -13,12 +14,24 @@@
  
  /* Ugly structure offset handling macros */
  
 -struct align_probe { char x; long int y; };
 -
  #define OFFSETOF(s, i) ((size_t) &((s *)0)->i)
- #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
+ #define SKIP_BACK(s, i, p) ({ s *_ptr = ((s *)((char *)p - OFFSETOF(s, i))); ASSERT_DIE(&_ptr->i == p); _ptr; })
  #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
 -#define CPU_STRUCT_ALIGN (sizeof(struct align_probe))
 +#define CPU_STRUCT_ALIGN  (MAX_(_Alignof(void*), _Alignof(u64)))
 +#define BIRD_CPU_ALIGN(s) BIRD_ALIGN((s), CPU_STRUCT_ALIGN)
 +
 +/* Structure item alignment macros */
 +
 +#define PADDING_NAME(id)	_padding_##id
 +#define PADDING_(id, sz)	u8 PADDING_NAME(id)[sz]
 +
 +#if CPU_POINTER_ALIGNMENT == 4
 +#define PADDING(id, n32, n64)	PADDING_(id, n32)
 +#elif CPU_POINTER_ALIGNMENT == 8
 +#define PADDING(id, n32, n64)	PADDING_(id, n64)
 +#else
 +#error "Strange CPU pointer alignment: " CPU_POINTER_ALIGNMENT
 +#endif
  
  /* Utility macros */