Skip to content

Commit

Permalink
[wip] Update to GCC 14.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Kartatz committed May 11, 2024
1 parent 2f17adb commit dc631a3
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 4 deletions.
3 changes: 3 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ if ! [ -f "${gcc_tarball}" ]; then
patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/0001-Fix-issues-with-fenv.patch"
# patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/0001-Revert___atomic_test_and_set_Fall_back_to_library,_not_non-atomic_code.patch"
patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/pk.patch"
patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/pk3.patch"


#patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/pk2.patch"
fi

Expand Down
8 changes: 4 additions & 4 deletions patches/pk.patch
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ index 4a01cd2..148a12d 100644
#include "libatomic_i.h"

+#if N == 1
extern bool __atomic_test_and_set (volatile void* a, int b)
{
return 0;
}
+bool __atomic_test_and_set (volatile void* a, int b)
+{
+ return 0;
+}
+#endif

/* If we support the builtin, just use it. */
Expand Down
25 changes: 25 additions & 0 deletions patches/pk3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From d7b42198720f088e7548d6a22c105188f723d828 Mon Sep 17 00:00:00 2001
From: Your Name <[email protected]>
Date: Sat, 11 May 2024 02:27:10 +0200
Subject: [PATCH] x

---
libatomic/tas_n.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libatomic/tas_n.c b/libatomic/tas_n.c
index be7661d..85f6afd 100644
--- a/libatomic/tas_n.c
+++ b/libatomic/tas_n.c
@@ -25,7 +25,7 @@
#include "libatomic_i.h"

#if N == 1
-bool __atomic_test_and_set (volatile void* a, int b)
+extern bool __atomic_test_and_set (volatile void* a, int b)
{
return 0;
}
--
2.36.6

0 comments on commit dc631a3

Please sign in to comment.