thanks for finding and fixing it. It has happened with every upgrade
that this file goes out of sync due to copyright headers change.
its perhaps worth trying to use a symlink instead try this patch and
see if it works in your settings
There is a redundant change in
0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch that
causes wordsize.h to be different in arm and aarch64. This causes the
build error when enable multilib:
Error: Transaction test error:
file /usr/include/bits/wordsize.h conflicts between attempted
