Skip to content

Backport patch to fix build error

Vignesh Raman requested to merge wip/vignesh/ftbfs-x86-fix into apertis/v2021-updates

cross-toolchain-base-ports version 27co1 fails to compile with the below error,

../sysdeps/unix/sysv/linux/alpha/sysdep.h:54: error: "__NR_osf_shmat" redefined [-Werror]
 #define __NR_osf_shmat  209

In file included from ../sysdeps/unix/sysv/linux/sys/syscall.h:24,
                 from ../sysdeps/unix/sysdep.h:20,
                 from ../sysdeps/unix/alpha/sysdep.h:19,
                 from ../sysdeps/unix/sysv/linux/alpha/sysdep.h:29,
                 from <stdin>:1:
/usr/src/packages/BUILD/glibc-2.28/debian/include/asm/unistd.h:8: note: this is the location of the previous definition
 #define __NR_osf_shmat __NR_shmat

cc1: all warnings being treated as errors

Definition of __NR_osf_shmat is added in 5.1 kernel, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=12b57c5c70f397a9410411d4e348096edada20f9

Backport the below patch to fix the build error, https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d5ecee822e72a2fd156338ab2be2f2e70a1da55a

Signed-off-by: Vignesh Raman vignesh.raman@collabora.com

Edited by Vignesh Raman

Merge request reports