Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (eb65635bd240edca99b6760b3eff42195d4287f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (eb65635bd240edca99b6760b3eff42195d4287f0)
  • Date: Tue, 11 Jun 2024 20:12:23 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

gnu/gcc/HISTORY | 2
gnu/gcc/patches/0001-Fix-building-JIT-with-musl-libc-PR115442.patch | 48
+++++++
gnu/gcc/patches/0014-Avoid-memory-poisoning-on-musl.patch | 61
----------
3 files changed, 49 insertions(+), 62 deletions(-)

New commits:
commit eb65635bd240edca99b6760b3eff42195d4287f0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gcc: Update patch

diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 593d209..cd4a96d 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,5 +1,5 @@
2024-06-11 Ismael Luceno <ismael AT sourcemage.org>
- * patches/0014-Avoid-memory-poisoning-on-musl.patch:
+ * patches/0001-Fix-building-JIT-with-musl-libc-PR115442.patch:
fixed build against musl

2024-05-07 Pavel Vinogradov <public AT sourcemage.org>
diff --git
a/gnu/gcc/patches/0001-Fix-building-JIT-with-musl-libc-PR115442.patch
b/gnu/gcc/patches/0001-Fix-building-JIT-with-musl-libc-PR115442.patch
new file mode 100644
index 0000000..65f9577
--- /dev/null
+++ b/gnu/gcc/patches/0001-Fix-building-JIT-with-musl-libc-PR115442.patch
@@ -0,0 +1,48 @@
+From e6b1c0820590a1f330099ed7560982b5c6da4e91 Mon Sep 17 00:00:00 2001
+From: Andrew Pinski <quic_apinski AT quicinc.com>
+Date: Tue, 11 Jun 2024 12:30:01 -0700
+Subject: [PATCH 1/13] Fix building JIT with musl libc [PR115442]
+
+Just like r13-6662-g0e6f87835ccabf but this time for jit/jit-recording.cc.
+
+Pushed as obvious after a quick build to make sure jit still builds.
+
+gcc/jit/ChangeLog:
+
+ PR jit/115442
+ * jit-recording.cc: Define INCLUDE_SSTREAM before including
+ system.h and don't directly incldue sstream.
+
+Signed-off-by: Andrew Pinski <quic_apinski AT quicinc.com>
+(cherry picked from commit e4244b88d75124f6957bfa080c8ad34017364e53)
+Ref: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115442
+Upstream-Status: Backport
+ [https://gcc.gnu.org/g:e6b1c0820590a1f330099ed7560982b5c6da4e91]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ gcc/jit/jit-recording.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc
+index 68a2e860c1fb..70830e349653 100644
+--- a/gcc/jit/jit-recording.cc
++++ b/gcc/jit/jit-recording.cc
+@@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+
+ #include "config.h"
++#define INCLUDE_SSTREAM
+ #include "system.h"
+ #include "coretypes.h"
+ #include "tm.h"
+@@ -29,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+-#include <sstream>
+
+ namespace gcc {
+ namespace jit {
+--
+2.43.0
+
diff --git a/gnu/gcc/patches/0014-Avoid-memory-poisoning-on-musl.patch
b/gnu/gcc/patches/0014-Avoid-memory-poisoning-on-musl.patch
deleted file mode 100644
index 18f4c46..0000000
--- a/gnu/gcc/patches/0014-Avoid-memory-poisoning-on-musl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andrew Pinski <pinskia AT gcc.gnu.org>
-Date: Tue, 11 Jun 2024 19:17:04 +0000
-Subject: [PATCH 14/14] Avoid <memory> poisoning on musl
-
-On musl <pthread.h> uses calloc() (via <sched.h>). <sstream> includes
-it indirectly and exposes use of poisoned calloc() when module code is
-built:
-
- /usr/src/gcc-14.1.0.bld/./prev-gcc/xg++
-B/usr/src/gcc-14.1.0.bld/./prev-gcc/ -B/usr/x86_64-pc-linux-musl/bin/
-nostdinc++
-B/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/src/.libs
-B/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/libsupc++/.libs
-isystem
/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/include/x86_64-pc-linux-musl
-isystem
/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/include
-isystem /usr/src/gcc-14.1.0/libstdc++-v3/libsupc++
-L/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/src/.libs
-L/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/libsupc++/.libs
-fcf-protection -fPIC -c -DIN_GCC_FRONTEND -march=native -mtune=native -m64
-fPIC -Os -fno-checking -gtoggle -DIN_GCC -fno-exceptions -fno-rtti
-fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings
-Wcast-qual -Wmissing-format-attribute -Wconditionally-supported
-Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros
-Wno-overlength-strings -DHAVE_CONFIG_H -fPIC -I. -Ijit
-I/usr/src/gcc-14.1.0/gcc -I/usr/src/gcc-14.1.0/gcc/jit
-I/usr/src/gcc-14.1.0/gcc/../include
-I/usr/src/gcc-14.1.0/gcc/../libcpp/include
-I/usr/src/gcc-14.1.0/gcc/../libcody -I//include -I//include -I/usr/include
-I/usr/src/gcc-14.1.0/gcc/../libdecnumber
-I/usr/src/gcc-14.1.0/gcc/../libdecnumber/bid -I../libdecnumber
-I/usr/src/gcc-14.1.0/gcc/../libbacktrace
-I/usr/src/gcc-14.1.0.bld/./isl/include -I/usr/src/gcc-14.1.0/isl/include -o
jit/jit-recording.o -MT jit/jit-recording.o -MMD -MP -MF
jit/.deps/jit-recording.TPo /usr/src/gcc-14.1.0/gcc/jit/jit-recording.cc
- In file included from /usr/include/pthread.h:30,
- from
/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/include/x86_64-pc-linux-musl/bits/gthr-default.h:35,
- from
/usr/src/gcc-14.1.0.bld/prev-x86_64-pc-linux-musl/libstdc++-v3/include/x86_64-pc-linux-musl/bits/gthr.h:157,
- from
/usr/src/gcc-14.1.0/libstdc++-v3/include/ext/atomicity.h:35,
- from
/usr/src/gcc-14.1.0/libstdc++-v3/include/bits/ios_base.h:39,
- from
/usr/src/gcc-14.1.0/libstdc++-v3/include/std/ios:44,
- from
/usr/src/gcc-14.1.0/libstdc++-v3/include/std/istream:40,
- from
/usr/src/gcc-14.1.0/libstdc++-v3/include/std/sstream:40,
- from /usr/src/gcc-14.1.0/gcc/jit/jit-recording.cc:32:
- /usr/include/sched.h:84:7: error: attempt to use poisoned "calloc"
- 84 | void *calloc(size_t, size_t);
- | ^
- In file included from /usr/src/gcc-14.1.0/gcc/jit/jit-recording.cc:22:
- /usr/src/gcc-14.1.0/gcc/system.h:938:21: note: poisoned here
- 938 | #pragma GCC poison calloc strdup strndup
- | ^~~~~~
- /usr/include/sched.h:124:36: error: attempt to use poisoned "calloc"
- 124 | #define CPU_ALLOC(n) ((cpu_set_t
*)calloc(1,CPU_ALLOC_SIZE(n)))
- | ^
- /usr/src/gcc-14.1.0/gcc/system.h:938:21: note: poisoned here
- 938 | #pragma GCC poison calloc strdup strndup
- | ^~~~~~
-
-Origin: Upstream
-Upstream-Status: Submitted
- [https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115442]
-Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
----
- gcc/jit/jit-recording.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc
-index 68a2e860c1f..70830e34965 100644
---- a/gcc/jit/jit-recording.cc
-+++ b/gcc/jit/jit-recording.cc
-@@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
-
- #include "config.h"
-+#define INCLUDE_SSTREAM
- #include "system.h"
- #include "coretypes.h"
- #include "tm.h"
-@@ -29,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
- #include "jit-builtins.h"
- #include "jit-recording.h"
- #include "jit-playback.h"
--#include <sstream>
-
- namespace gcc {
- namespace jit {


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (eb65635bd240edca99b6760b3eff42195d4287f0), Ismael Luceno, 06/11/2024

Archive powered by MHonArc 2.6.24.

Top of Page