diff mbox series

[1/2] glibc: unify wordsize.h between arm and aarch64

Message ID 20220224074107.867356-1-yi.zhao@windriver.com
State Accepted, archived
Commit 402ba8367f5316fd8d25a536ebd12bc0bcdfa400
Headers show
Series [1/2] glibc: unify wordsize.h between arm and aarch64 | expand

Commit Message

Yi Zhao Feb. 24, 2022, 7:41 a.m. UTC 
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>
---
 ...dsize.h-Unify-the-header-between-arm-and-aarch64.patch | 8 --------
 1 file changed, 8 deletions(-)
diff mbox series

Patch

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/>.  */