Failed compiling releng/13.2, commit missing?

Hi everyone,

I tried compiling releng/13.2 on a fresh stable/13. That fails with:

--- _bootstrap-tools-usr.sbin/zic ---
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:464:8: 
error: an attribute list cannot appear here
   464 | static ATTRIBUTE_NORETURN void
       |        ^~~~~~~~~~~~~~~~~~
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: 
note: expanded from macro 'ATTRIBUTE_NORETURN'
   471 | #  define ATTRIBUTE_NORETURN [[noreturn]]
       |                              ^~~~~~~~~~~~
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:471:8: 
error: an attribute list cannot appear here
   471 | static ATTRIBUTE_NORETURN void
       |        ^~~~~~~~~~~~~~~~~~
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: 
note: expanded from macro 'ATTRIBUTE_NORETURN'
   471 | #  define ATTRIBUTE_NORETURN [[noreturn]]
       |                              ^~~~~~~~~~~~
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:669:8: 
error: an attribute list cannot appear here
   669 | static ATTRIBUTE_NORETURN void
       |        ^~~~~~~~~~~~~~~~~~
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: 
note: expanded from macro 'ATTRIBUTE_NORETURN'
   471 | #  define ATTRIBUTE_NORETURN [[noreturn]]
       |                              ^~~~~~~~~~~~
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:3778:8: 
error: an attribute list cannot appear here
  3778 | static ATTRIBUTE_NORETURN void
       |        ^~~~~~~~~~~~~~~~~~
/scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: 
note: expanded from macro 'ATTRIBUTE_NORETURN'
   471 | #  define ATTRIBUTE_NORETURN [[noreturn]]
       |                              ^~~~~~~~~~~~
4 errors generated.
*** [zic.o] Error code 1

make[3]: stopped in /scratch/20240303_162512/stage/usr/src/usr.sbin/zic


Compiling stable/13 itself is fine.
Looking at the history of zic, comparing releng/13.2 and stable/13,
https://github.com/freebsd/freebsd-src/commits/releng/13.2/contrib/tzcode/zic.c 
and 
https://github.com/freebsd/freebsd-src/commits/stable/13/contrib/tzcode/zic.c, 
we see that stable/13 has an extra commit "Update tzcode to 2023c." that 
does change that attribute/keyword order.

Releng/13.2 has "import tzdata 2023d" and "...2024a", but no "...2023c". 
Is that commit simply missing on that branch?



cheers,

Johannes