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:39:00 +0000 |
| commit | 402ba8367f5316fd8d25a536ebd12bc0bcdfa400 (patch) | |
| tree | 54b92a4ae8f30d3a9241f312c24a937e11175904 /meta/recipes-core | |
| parent | 78a4bccfa38c2d3a6a4a097319eec28c2bc357a7 (diff) | |
| download | openembedded-core-contrib-402ba8367f5316fd8d25a536ebd12bc0bcdfa400.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
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -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 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/>. */ |