mirror of
https://git.yoctoproject.org/poky
synced 2026-04-09 02:02:26 +02:00
glibc: unify wordsize.h between arm and aarch64
Make sure this header file is same in arm and aarch64. Fix the conflict error when enable multilib: Error: Transaction test error: file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.35-r0.armv7vet2hf_vfp and libc6-dev-2.35-r0.cortexa57 (From OE-Core rev: 402ba8367f5316fd8d25a536ebd12bc0bcdfa400) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -46,14 +46,6 @@ copy to sysdeps/arm/bits/wordsize.h
|
||||
index 4635431f0e..34fcdef1f1 100644
|
||||
--- a/sysdeps/aarch64/bits/wordsize.h
|
||||
+++ b/sysdeps/arm/bits/wordsize.h
|
||||
@@ -1,6 +1,6 @@
|
||||
/* Determine the wordsize from the preprocessor defines.
|
||||
|
||||
- Copyright (C) 2016-2022 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 2016-2020 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@@ -17,12 +17,16 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
Reference in New Issue
Block a user