diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2022-02-24 15:41:06 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-25 12:41:23 +0000 |
commit | f44c0187ed3133ecd32e96b2eb2df790f001cda7 (patch) | |
tree | eb2d266653a8d21b6a10dd1cc75e1cea1301cac5 /meta/recipes-core/glibc/glibc | |
parent | cb0aa0d09a82258182ea22fd1dad7181e9646ec7 (diff) | |
download | poky-f44c0187ed3133ecd32e96b2eb2df790f001cda7.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core/glibc/glibc')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/meta/recipes-core/glibc/glibc/0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 63f7749ecb..3b2d638b5f 100644 --- a/meta/recipes-core/glibc/glibc/0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | |||
@@ -46,14 +46,6 @@ copy to sysdeps/arm/bits/wordsize.h | |||
46 | index 4635431f0e..34fcdef1f1 100644 | 46 | index 4635431f0e..34fcdef1f1 100644 |
47 | --- a/sysdeps/aarch64/bits/wordsize.h | 47 | --- a/sysdeps/aarch64/bits/wordsize.h |
48 | +++ b/sysdeps/arm/bits/wordsize.h | 48 | +++ b/sysdeps/arm/bits/wordsize.h |
49 | @@ -1,6 +1,6 @@ | ||
50 | /* Determine the wordsize from the preprocessor defines. | ||
51 | |||
52 | - Copyright (C) 2016-2022 Free Software Foundation, Inc. | ||
53 | + Copyright (C) 2016-2020 Free Software Foundation, Inc. | ||
54 | This file is part of the GNU C Library. | ||
55 | |||
56 | The GNU C Library is free software; you can redistribute it and/or | ||
57 | @@ -17,12 +17,16 @@ | 49 | @@ -17,12 +17,16 @@ |
58 | License along with the GNU C Library; if not, see | 50 | License along with the GNU C Library; if not, see |
59 | <https://www.gnu.org/licenses/>. */ | 51 | <https://www.gnu.org/licenses/>. */ |