diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 0ebf8a6183..791029c4c0 100644 --- a/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From bf1c4b2f01c5f86bb770fd1711a69ea727e0f56e Mon Sep 17 00:00:00 2001 | 1 | From 2ae3ff3ae28abb1d0d100b4722da7ff188de9a30 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 15 May 2020 17:05:45 -0700 | 3 | Date: Fri, 15 May 2020 17:05:45 -0700 |
4 | Subject: [PATCH 29/29] wordsize.h: Unify the header between arm and aarch64 | 4 | Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64 |
5 | 5 | ||
6 | This helps OE multilibs to not sythesize this header which causes all | 6 | This helps OE multilibs to not sythesize this header which causes all |
7 | kind of recursions and other issues since wordsize is fundamental header | 7 | kind of recursions and other issues since wordsize is fundamental header |
@@ -11,13 +11,13 @@ 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 | 8 ++++++-- | 15 | sysdeps/{aarch64 => arm}/bits/wordsize.h | 10 +++++++--- |
16 | 2 files changed, 12 insertions(+), 4 deletions(-) | 16 | 2 files changed, 13 insertions(+), 5 deletions(-) |
17 | copy sysdeps/{aarch64 => arm}/bits/wordsize.h (85%) | 17 | copy sysdeps/{aarch64 => arm}/bits/wordsize.h (80%) |
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 ee01841773..34fcdef1f1 100644 | 20 | index 91da566b74..9a754514b3 100644 |
21 | --- a/sysdeps/aarch64/bits/wordsize.h | 21 | --- a/sysdeps/aarch64/bits/wordsize.h |
22 | +++ b/sysdeps/aarch64/bits/wordsize.h | 22 | +++ b/sysdeps/aarch64/bits/wordsize.h |
23 | @@ -17,12 +17,16 @@ | 23 | @@ -17,12 +17,16 @@ |
@@ -40,12 +40,20 @@ index ee01841773..34fcdef1f1 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 85% | 43 | similarity index 80% |
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 ee01841773..34fcdef1f1 100644 | 46 | index 91da566b74..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-2021 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 | ||
49 | @@ -17,12 +17,16 @@ | 57 | @@ -17,12 +17,16 @@ |
50 | License along with the GNU C Library; if not, see | 58 | License along with the GNU C Library; if not, see |
51 | <https://www.gnu.org/licenses/>. */ | 59 | <https://www.gnu.org/licenses/>. */ |
@@ -65,6 +73,3 @@ index ee01841773..34fcdef1f1 100644 | |||
65 | #endif | 73 | #endif |
66 | 74 | ||
67 | #define __WORDSIZE_TIME64_COMPAT32 0 | 75 | #define __WORDSIZE_TIME64_COMPAT32 0 |
68 | -- | ||
69 | 2.27.0 | ||
70 | |||