mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 05:51:45 -09:00
package/gcc: drop stale 13.3.0 patches
Commit0b8b72d2febumped gcc 13.x from 13.3.0 to 13.4.0 but forgot to drop the gcc 13.3.0, so let's remove those patches. Cc: Kadambini Nema <kadambini.nema@gmail.com> Fixes:0b8b72d2feSigned-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Julien Olivain <ju.o@free.fr> (cherry picked from commit2fbf98da7c) Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
committed by
Thomas Perale
parent
d0d8343729
commit
d4c8beb62d
@@ -1,44 +0,0 @@
|
|||||||
From 88b73eedcfa0fc58aee2555377e6f7d4de153282 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Fri, 3 Feb 2023 11:48:35 -0800
|
|
||||||
Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux
|
|
||||||
|
|
||||||
On 32-bit glibc>=2.34 systems using 64bit time_t build fails because
|
|
||||||
_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64
|
|
||||||
|
|
||||||
Fixes
|
|
||||||
|
|
||||||
```
|
|
||||||
/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed
|
|
||||||
only with _FILE_OFFSET_BITS=64"
|
|
||||||
| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
|
|
||||||
| ^
|
|
||||||
| 1 error generated.
|
|
||||||
```
|
|
||||||
|
|
||||||
Reviewed By: thesamesam, MaskRay
|
|
||||||
|
|
||||||
Differential Revision: https://reviews.llvm.org/D140812
|
|
||||||
|
|
||||||
Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9
|
|
||||||
Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
---
|
|
||||||
.../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
||||||
index bcbd143d19d..1b23898b374 100644
|
|
||||||
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
||||||
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
||||||
@@ -18,6 +18,7 @@
|
|
||||||
// depends on _FILE_OFFSET_BITS setting.
|
|
||||||
// To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
|
|
||||||
#undef _FILE_OFFSET_BITS
|
|
||||||
+#undef _TIME_BITS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Must go after undef _FILE_OFFSET_BITS.
|
|
||||||
--
|
|
||||||
2.45.2
|
|
||||||
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
From 7ad54084a2c07cca6d03dfe274893e903852d359 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
Date: Thu, 18 Jul 2024 23:13:41 +0200
|
|
||||||
Subject: [PATCH] libsanitizer: also undef _TIME_BITS in
|
|
||||||
sanitizer_procmaps_solaris.cpp
|
|
||||||
|
|
||||||
Upstream commit
|
|
||||||
https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9
|
|
||||||
of LLVM added a #undef _TIME_BITS in
|
|
||||||
libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to
|
|
||||||
fix the build on 32-bit Linux platforms that have enabled 64-bit
|
|
||||||
time_t using _TIME_BITS=64.
|
|
||||||
|
|
||||||
Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but
|
|
||||||
sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before
|
|
||||||
including any header file. To fix this, the upstream fix was to also
|
|
||||||
undef _TIME_BITS.
|
|
||||||
|
|
||||||
This commit simply does the same in sanitizer_procmaps_solaris.cpp,
|
|
||||||
which also gets compiled under Linux (despite what the file name
|
|
||||||
says). In practice on Linux hosts (where _TIME_BITS=64 matters),
|
|
||||||
sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much
|
|
||||||
the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So
|
|
||||||
the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here
|
|
||||||
before including sanitizer_platform.h, which will set the
|
|
||||||
SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform.
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
|
|
||||||
armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
|
|
||||||
26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
|
|
||||||
|
|
||||||
Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
---
|
|
||||||
libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp
|
|
||||||
index eeb49e2afe3..1b23fd4d512 100644
|
|
||||||
--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp
|
|
||||||
+++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
|
|
||||||
// Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment.
|
|
||||||
#undef _FILE_OFFSET_BITS
|
|
||||||
+#undef _TIME_BITS
|
|
||||||
#include "sanitizer_platform.h"
|
|
||||||
#if SANITIZER_SOLARIS
|
|
||||||
# include <fcntl.h>
|
|
||||||
--
|
|
||||||
2.45.2
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user