diff options
author | Yi Zhao <yi.zhao@eng.windriver.com> | 2023-02-09 18:00:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-10 09:25:44 +0000 |
commit | 863d2bcf0ee3dfaafb9e69628122f98d3c6c9f1a (patch) | |
tree | 184ed6ad9795a3b094341d7801f286f8f8c13e02 /meta/recipes-core/glibc | |
parent | 456a61c0f82bffccdc415405214bf5227d5f6b43 (diff) | |
download | poky-863d2bcf0ee3dfaafb9e69628122f98d3c6c9f1a.tar.gz |
glibc: unify wordsize.h between arm and aarch64
There is a redundant change in
0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch that
causes wordsize.h to be different in arm and aarch64. This causes the
build error when enable multilib:
Error: Transaction test error:
file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.37-r0.armv7vet2hf_vfp and libc6-dev-2.37-r0.cortexa57
(From OE-Core rev: 303bb3b735da434eb135ee857c2c49c55da61918)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 9ed89c93da..90a6cc2363 100644 --- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | |||
@@ -11,10 +11,10 @@ Upstream-Status: Inappropriate [ OE-Specific ] | |||
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | --- | 13 | --- |
14 | sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- | 14 | sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- |
15 | sysdeps/{aarch64 => arm}/bits/wordsize.h | 10 +++++++--- | 15 | sysdeps/{aarch64 => arm}/bits/wordsize.h | 8 ++++++-- |
16 | 2 files changed, 13 insertions(+), 5 deletions(-) | 16 | 2 files changed, 12 insertions(+), 4 deletions(-) |
17 | copy sysdeps/{aarch64 => arm}/bits/wordsize.h (80%) | 17 | copy sysdeps/{aarch64 => arm}/bits/wordsize.h (85%) |
18 | 18 | ||
19 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h | 19 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h |
20 | index 04d4be9519..63876a7830 100644 | 20 | index 04d4be9519..63876a7830 100644 |
@@ -40,20 +40,12 @@ index 04d4be9519..63876a7830 100644 | |||
40 | 40 | ||
41 | #define __WORDSIZE_TIME64_COMPAT32 0 | 41 | #define __WORDSIZE_TIME64_COMPAT32 0 |
42 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h | 42 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h |
43 | similarity index 80% | 43 | similarity index 85% |
44 | copy from sysdeps/aarch64/bits/wordsize.h | 44 | copy from sysdeps/aarch64/bits/wordsize.h |
45 | copy to sysdeps/arm/bits/wordsize.h | 45 | copy to sysdeps/arm/bits/wordsize.h |
46 | index 04d4be9519..5ef0ed21f3 100644 | 46 | index 04d4be9519..63876a7830 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-2023 Free Software Foundation, Inc. | ||
53 | + Copyright (C) 2016-2022 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/>. */ |