mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

glibc: Fix the arm/arm64 worsize.h uniificationb patch

Browse Source 
The symlink got mangled during the 2.40 upgrade

(From OE-Core rev: f4d9a708e8c61d147e8b06d94f13ae57b6f879e7)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Maohui Lei <leimaohui@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2024-09-03 20:17:59 -07:00
committed by Richard Purdie
parent f0e84fa257
commit b897daf8b7
1 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
+45 -5
View File
@@ -1,4 +1,4 @@
From 3be9d4a66f83a64b26ffa0869385e4a0f623dd44 Mon Sep 17 00:00:00 2001 From 4dd93c44d85ad04343daa9933edfb6ae59863095 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 15 May 2020 17:05:45 -0700 Date: Fri, 15 May 2020 17:05:45 -0700
Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64 Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64
@@ -11,14 +11,16 @@ Upstream-Status: Inappropriate [ OE-Specific ]
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- ---
sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- sysdeps/aarch64/bits/wordsize.h | 11 +++++++++--
1 file changed, 6 insertions(+), 2 deletions(-) sysdeps/arm/bits/wordsize.h | 22 +---------------------
2 files changed, 10 insertions(+), 23 deletions(-)
mode change 100644 => 120000 sysdeps/arm/bits/wordsize.h
diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h
index 118e59172d..b4b0692eb5 100644 index 118e59172d..c6278c6afa 100644
--- a/sysdeps/aarch64/bits/wordsize.h --- a/sysdeps/aarch64/bits/wordsize.h
+++ b/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h
@@ -17,12 +17,16 @@ @@ -17,12 +17,19 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
@@ -32,8 +34,46 @@ index 118e59172d..b4b0692eb5 100644
# define __WORDSIZE32_PTRDIFF_LONG 1 # define __WORDSIZE32_PTRDIFF_LONG 1
+#else +#else
+# define __WORDSIZE 32 +# define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 1
+# define __WORDSIZE32_SIZE_ULONG 0 +# define __WORDSIZE32_SIZE_ULONG 0
+# define __WORDSIZE32_PTRDIFF_LONG 0 +# define __WORDSIZE32_PTRDIFF_LONG 0
#endif #endif
+#ifdef __aarch64__
#define __WORDSIZE_TIME64_COMPAT32 0 #define __WORDSIZE_TIME64_COMPAT32 0
+#endif
diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h
deleted file mode 100644
index 6ecbfe7c86..0000000000
--- a/sysdeps/arm/bits/wordsize.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright (C) 1999-2024 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#define __WORDSIZE 32
-#define __WORDSIZE_TIME64_COMPAT32 1
-#define __WORDSIZE32_SIZE_ULONG 0
-#define __WORDSIZE32_PTRDIFF_LONG 0
diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h
new file mode 120000
index 0000000000..4c4a788ec2
--- /dev/null
+++ b/sysdeps/arm/bits/wordsize.h
@@ -0,0 +1 @@
+../../aarch64/bits/wordsize.h
\ No newline at end of file