Unverified Commit a836e723 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #180824 from trofi/fix-gcc-12-for-musl 

pkgsMusl.gcc12: backport build fix (PR106102)
parents 06173fc8 8f00857b

pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch

0 → 100644
+52 −0
Original line number Diff line number Diff line 
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=3b21c21f3f5726823e19728fdd1571a14aae0fb3

https://gcc.gnu.org/PR106102

--- a/gcc/cp/mapper-client.cc

+++ b/gcc/cp/mapper-client.cc

@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.  If not see

 #define INCLUDE_STRING

 #define INCLUDE_VECTOR

 #define INCLUDE_MAP

+#define INCLUDE_MEMORY

 #include "system.h"

 

 #include "line-map.h"

--- a/gcc/cp/mapper-resolver.cc

+++ b/gcc/cp/mapper-resolver.cc

@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3.  If not see

 #define INCLUDE_VECTOR

 #define INCLUDE_ALGORITHM

 #define INCLUDE_MAP

+#define INCLUDE_MEMORY

 #include "system.h"

 

 // We don't want or need to be aware of networking

--- a/gcc/cp/module.cc

+++ b/gcc/cp/module.cc

@@ -206,6 +206,7 @@ Classes used:

 

 #define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available.  */

 #include "config.h"

+#define INCLUDE_MEMORY

 #define INCLUDE_STRING

 #define INCLUDE_VECTOR

 #include "system.h"

--- a/libcc1/libcc1plugin.cc

+++ b/libcc1/libcc1plugin.cc

@@ -31,6 +31,7 @@

 #undef PACKAGE_TARNAME

 #undef PACKAGE_VERSION

 

+#define INCLUDE_MEMORY

 #include "gcc-plugin.h"

 #include "system.h"

 #include "coretypes.h"

--- a/libcc1/libcp1plugin.cc

+++ b/libcc1/libcp1plugin.cc

@@ -32,6 +32,7 @@

 #undef PACKAGE_TARNAME

 #undef PACKAGE_VERSION

 

+#define INCLUDE_MEMORY

 #include "gcc-plugin.h"

 #include "system.h"

 #include "coretypes.h"

pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch

0 → 100644
+67 −0
Original line number Diff line number Diff line 
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=49d508065bdd36fb1a9b6aad9666b1edb5e06474

https://gcc.gnu.org/PR106102

--- a/gcc/jit/jit-playback.cc

+++ b/gcc/jit/jit-playback.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_PTHREAD_H

 #include "system.h"

 #include "coretypes.h"

 #include "target.h"

@@ -41,8 +42,6 @@ along with GCC; see the file COPYING3.  If not see

 #include "diagnostic.h"

 #include "stmt.h"

 

-#include <pthread.h>

-

 #include "jit-playback.h"

 #include "jit-result.h"

 #include "jit-builtins.h"

--- a/gcc/jit/jit-recording.cc

+++ b/gcc/jit/jit-recording.cc

@@ -19,13 +19,13 @@ along with GCC; see the file COPYING3.  If not see

 <http://www.gnu.org/licenses/>.  */

 

 #include "config.h"

+#define INCLUDE_PTHREAD_H

 #include "system.h"

 #include "coretypes.h"

 #include "tm.h"

 #include "pretty-print.h"

 #include "toplev.h"

 

-#include <pthread.h>

 

 #include "jit-builtins.h"

 #include "jit-recording.h"

--- a/gcc/jit/libgccjit.cc

+++ b/gcc/jit/libgccjit.cc

@@ -19,12 +19,12 @@ along with GCC; see the file COPYING3.  If not see

 <http://www.gnu.org/licenses/>.  */

 

 #include "config.h"

+#define INCLUDE_PTHREAD_H

 #include "system.h"

 #include "coretypes.h"

 #include "timevar.h"

 #include "typed-splay-tree.h"

 #include "cppbuiltin.h"

-#include <pthread.h>

 

 #include "libgccjit.h"

 #include "jit-recording.h"

--- a/gcc/system.h

+++ b/gcc/system.h

@@ -753,6 +753,10 @@ extern int vsnprintf (char *, size_t, const char *, va_list);

 #endif

 #endif

 

+#ifdef INCLUDE_PTHREAD_H

+#include <pthread.h>

+#endif

+

 #ifdef INCLUDE_ISL

 #ifdef HAVE_isl

 #include <isl/options.h>

pkgs/development/compilers/gcc/12/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ let majorVersion = "12"; 
        ../gnat-cflags-11.patch

        ../gcc-12-gfortran-driving.patch

        ../ppc-musl.patch

        # Backports. Should be removed with 12.2.0 release:

        ./PR106102-musl-poison-cpp.patch

        ./PR106102-musl-poison-jit.patch

      ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch {

        url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.1.0...gcc-11.1.0-arm-20210504.diff";

        sha256 = "sha256-JqCGJAfbOxSmkNyq49aFHteK/RFsCSLQrL9mzUCnaD0=";