commit 2a196a727875db31f845cb97da9fc102240c36b3 · pyrox.dev/nixpkgs

doc/release-notes/rl-2511.section.md

···

       20
       20
        
       

     

       21
       21
        
       - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader

     

       22
       22
        
       

     

       23
       23
       +
       - GCC 9 has been removed, as it has reached end‐of‐life upstream and is no longer supported.

     

       24
       24
       +
       

     

       23
       25
        
       - `base16-builder` node package has been removed due to lack of upstream maintenance.

     

       24
       26
        
       - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.

     

       25
       27
        
       - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.

-10

pkgs/by-name/gf/gfortran9/package.nix

···

       1
       1
       -
       { wrapCC, gcc9 }:

     

       2
       2
       -
       wrapCC (

     

       3
       3
       -
         gcc9.cc.override {

     

       4
       4
       -
           name = "gfortran";

     

       5
       5
       -
           langFortran = true;

     

       6
       6
       -
           langCC = false;

     

       7
       7
       -
           langC = false;

     

       8
       8
       -
           profiledCompiler = false;

     

       9
       9
       -
         }

     

       10
       10
       -
       )

+1 -1

pkgs/development/compilers/gcc/common/dependencies.nix

···

       76
       76
        
           gmp

     

       77
       77
        
           mpfr

     

       78
       78
        
           libmpc

     

       79
       79
       +
           libxcrypt

     

       79
       80
        
         ]

     

       80
       80
       -
         ++ optionals (lib.versionAtLeast version "10") [ libxcrypt ]

     

       81
       81
        
         ++ [

     

       82
       82
        
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       83
       83
        
         ]

+3 -14

pkgs/development/compilers/gcc/default.nix

···

       53
       53
        
         callPackage,

     

       54
       54
        
         majorMinorVersion,

     

       55
       55
        
         apple-sdk,

     

       56
       56
       -
         cctools,

     

       57
       56
        
         darwin,

     

       58
       57
        
       }:

     

       59
       58
        
       

     
···

       84
       83
        
         atLeast13 = versionAtLeast version "13";

     

       85
       84
        
         atLeast12 = versionAtLeast version "12";

     

       86
       85
        
         atLeast11 = versionAtLeast version "11";

     

       87
       87
       -
         atLeast10 = versionAtLeast version "10";

     

       88
       86
        
         is14 = majorVersion == "14";

     

       89
       87
        
         is13 = majorVersion == "13";

     

       90
       88
        
         is12 = majorVersion == "12";

     

       91
       89
        
         is11 = majorVersion == "11";

     

       92
       90
        
         is10 = majorVersion == "10";

     

       93
       93
       -
         is9 = majorVersion == "9";

     

       94
       91
        
       

     

       95
       92
        
         # releases have a form: MAJOR.MINOR.MICRO, like 14.2.1

     

       96
       93
        
         # snapshots have a form like MAJOR.MINOR.MICRO.DATE, like 14.2.1.20250322

     
···

       326
       323
        
               depsTargetTarget

     

       327
       324
        
               ;

     

       328
       325
        
       

     

       329
       329
       -
             preConfigure =

     

       330
       330
       -
               (callFile ./common/pre-configure.nix { })

     

       331
       331
       -
               + optionalString atLeast10 ''

     

       332
       332
       -
                 ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h

     

       333
       333
       -
               '';

     

       326
       326
       +
             preConfigure = (callFile ./common/pre-configure.nix { }) + ''

     

       327
       327
       +
               ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h

     

       328
       328
       +
             '';

     

       334
       329
        
       

     

       335
       330
        
             dontDisableStatic = true;

     

       336
       331
        
       

     
···

       465
       460
        
               badPlatforms =

     

       466
       461
        
                 if (!lib.systems.equals targetPlatform hostPlatform) then [ "aarch64-darwin" ] else [ ];

     

       467
       462
        
             };

     

       468
       468
       -
           }

     

       469
       469
       -
           // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) {

     

       470
       470
       -
             # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools.

     

       471
       471
       -
             preBuild = ''

     

       472
       472
       -
               makeFlagsArray+=('STRIP=${getBin cctools}/bin/${stdenv.cc.targetPrefix}strip')

     

       473
       473
       -
             '';

     

       474
       463
        
           }

     

       475
       464
        
           // optionalAttrs enableMultilib {

     

       476
       465
        
             dontMoveLib64 = true;

-306

pkgs/development/compilers/gcc/patches/9/Added-mcf-thread-model-support-from-mcfgthread.patch

···

       1
       1
       -
       From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Liu Hao <lh_mouse@126.com>

     

       3
       3
       -
       Date: Wed, 25 Apr 2018 21:54:19 +0800

     

       4
       4
       -
       Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.

     

       5
       5
       -
       

     

       6
       6
       -
       Signed-off-by: Liu Hao <lh_mouse@126.com>

     

       7
       7
       -
       ---

     

       8
       8
       -
        config/gthr.m4                          |  1 +

     

       9
       9
       -
        gcc/config.gcc                          |  3 +++

     

       10
       10
       -
        gcc/config/i386/mingw-mcfgthread.h      |  1 +

     

       11
       11
       -
        gcc/config/i386/mingw-w64.h             |  2 +-

     

       12
       12
       -
        gcc/config/i386/mingw32.h               | 11 ++++++++++-

     

       13
       13
       -
        gcc/configure                           |  2 +-

     

       14
       14
       -
        gcc/configure.ac                        |  2 +-

     

       15
       15
       -
        libatomic/configure.tgt                 |  2 +-

     

       16
       16
       -
        libgcc/config.host                      |  6 ++++++

     

       17
       17
       -
        libgcc/config/i386/gthr-mcf.h           |  1 +

     

       18
       18
       -
        libgcc/config/i386/t-mingw-mcfgthread   |  2 ++

     

       19
       19
       -
        libgcc/configure                        |  1 +

     

       20
       20
       -
        libstdc++-v3/configure                  |  1 +

     

       21
       21
       -
        libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++

     

       22
       22
       -
        libstdc++-v3/libsupc++/guard.cc         | 23 +++++++++++++++++++++++

     

       23
       23
       -
        libstdc++-v3/src/c++11/thread.cc        |  9 +++++++++

     

       24
       24
       -
        16 files changed, 80 insertions(+), 5 deletions(-)

     

       25
       25
       -
        create mode 100644 gcc/config/i386/mingw-mcfgthread.h

     

       26
       26
       -
        create mode 100644 libgcc/config/i386/gthr-mcf.h

     

       27
       27
       -
        create mode 100644 libgcc/config/i386/t-mingw-mcfgthread

     

       28
       28
       -
       

     

       29
       29
       -
       diff --git a/config/gthr.m4 b/config/gthr.m4

     

       30
       30
       -
       index 7b29f1f3327..82e21fe1709 100644

     

       31
       31
       -
       --- a/config/gthr.m4

     

       32
       32
       -
       +++ b/config/gthr.m4

     

       33
       33
       -
       @@ -21,6 +21,7 @@ case $1 in

     

       34
       34
       -
            tpf)	thread_header=config/s390/gthr-tpf.h ;;

     

       35
       35
       -
            vxworks)	thread_header=config/gthr-vxworks.h ;;

     

       36
       36
       -
            win32)	thread_header=config/i386/gthr-win32.h ;;

     

       37
       37
       -
       +    mcf)	thread_header=config/i386/gthr-mcf.h ;;

     

       38
       38
       -
        esac

     

       39
       39
       -
        AC_SUBST(thread_header)

     

       40
       40
       -
        ])

     

       41
       41
       -
       diff --git a/gcc/config.gcc b/gcc/config.gcc

     

       42
       42
       -
       index 46a9029acec..112c24e95a3 100644

     

       43
       43
       -
       --- a/gcc/config.gcc

     

       44
       44
       -
       +++ b/gcc/config.gcc

     

       45
       45
       -
       @@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)

     

       46
       46
       -
        	if test x$enable_threads = xposix ; then

     

       47
       47
       -
        		tm_file="${tm_file} i386/mingw-pthread.h"

     

       48
       48
       -
        	fi

     

       49
       49
       -
       +	if test x$enable_threads = xmcf ; then

     

       50
       50
       -
       +		tm_file="${tm_file} i386/mingw-mcfgthread.h"

     

       51
       51
       -
       +	fi

     

       52
       52
       -
        	tm_file="${tm_file} i386/mingw32.h"

     

       53
       53
       -
        	# This makes the logic if mingw's or the w64 feature set has to be used

     

       54
       54
       -
        	case ${target} in

     

       55
       55
       -
       diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h

     

       56
       56
       -
       new file mode 100644

     

       57
       57
       -
       index 00000000000..ec381a7798f

     

       58
       58
       -
       --- /dev/null

     

       59
       59
       -
       +++ b/gcc/config/i386/mingw-mcfgthread.h

     

       60
       60
       -
       @@ -0,0 +1 @@

     

       61
       61
       -
       +#define TARGET_USE_MCFGTHREAD 1

     

       62
       62
       -
       diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h

     

       63
       63
       -
       index 484dc7a9e9f..a15bbeea500 100644

     

       64
       64
       -
       --- a/gcc/config/i386/mingw-w64.h

     

       65
       65
       -
       +++ b/gcc/config/i386/mingw-w64.h

     

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

     

       67
       67
       -
        		 "%{mwindows:-lgdi32 -lcomdlg32} " \

     

       68
       68
       -
             "%{fvtable-verify=preinit:-lvtv -lpsapi; \

     

       69
       69
       -
                fvtable-verify=std:-lvtv -lpsapi} " \

     

       70
       70
       -
       -		 "-ladvapi32 -lshell32 -luser32 -lkernel32"

     

       71
       71
       -
       +		 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"

     

       72
       72
       -
        

     

       73
       73
       -
        #undef SPEC_32

     

       74
       74
       -
        #undef SPEC_64

     

       75
       75
       -
       diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h

     

       76
       76
       -
       index 0612b87199a..76cea94f3b7 100644

     

       77
       77
       -
       --- a/gcc/config/i386/mingw32.h

     

       78
       78
       -
       +++ b/gcc/config/i386/mingw32.h

     

       79
       79
       -
       @@ -32,6 +32,14 @@ along with GCC; see the file COPYING3.  If not see

     

       80
       80
       -
        	 | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \

     

       81
       81
       -
        	 | MASK_MS_BITFIELD_LAYOUT)

     

       82
       82
       -
        

     

       83
       83
       -
       +#ifndef TARGET_USE_MCFGTHREAD

     

       84
       84
       -
       +#define CPP_MCFGTHREAD()  ((void)0)

     

       85
       85
       -
       +#define LIB_MCFGTHREAD     ""

     

       86
       86
       -
       +#else

     

       87
       87
       -
       +#define CPP_MCFGTHREAD()  (builtin_define("__USING_MCFGTHREAD__"))

     

       88
       88
       -
       +#define LIB_MCFGTHREAD     " -lmcfgthread "

     

       89
       89
       -
       +#endif

     

       90
       90
       -
       +

     

       91
       91
       -
        /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS

     

       92
       92
       -
           is for compatibility with native compiler.  */

     

       93
       93
       -
        #define EXTRA_OS_CPP_BUILTINS()					\

     

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

     

       95
       95
       -
        	  builtin_define_std ("WIN64");				\

     

       96
       96
       -
        	  builtin_define ("_WIN64");				\

     

       97
       97
       -
        	}							\

     

       98
       98
       -
       +	CPP_MCFGTHREAD();	\

     

       99
       99
       -
            }								\

     

       100
       100
       -
          while (0)

     

       101
       101
       -
        

     

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

     

       103
       103
       -
        		 "%{mwindows:-lgdi32 -lcomdlg32} " \

     

       104
       104
       -
             "%{fvtable-verify=preinit:-lvtv -lpsapi; \

     

       105
       105
       -
                fvtable-verify=std:-lvtv -lpsapi} " \

     

       106
       106
       -
       -                 "-ladvapi32 -lshell32 -luser32 -lkernel32"

     

       107
       107
       -
       +                 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"

     

       108
       108
       -
        

     

       109
       109
       -
        /* Weak symbols do not get resolved if using a Windows dll import lib.

     

       110
       110
       -
           Make the unwind registration references strong undefs.  */

     

       111
       111
       -
       diff --git a/gcc/configure b/gcc/configure

     

       112
       112
       -
       index 6121e163259..52f0e00efe6 100755

     

       113
       113
       -
       --- a/gcc/configure

     

       114
       114
       -
       +++ b/gcc/configure

     

       115
       115
       -
       @@ -11693,7 +11693,7 @@ case ${enable_threads} in

     

       116
       116
       -
            target_thread_file='single'

     

       117
       117
       -
            ;;

     

       118
       118
       -
          aix | dce | lynx | mipssde | posix | rtems | \

     

       119
       119
       -
       -  single | tpf | vxworks | win32)

     

       120
       120
       -
       +  single | tpf | vxworks | win32 | mcf)

     

       121
       121
       -
            target_thread_file=${enable_threads}

     

       122
       122
       -
            ;;

     

       123
       123
       -
          *)

     

       124
       124
       -
       diff --git a/gcc/configure.ac b/gcc/configure.ac

     

       125
       125
       -
       index b066cc609e1..4ecdba88de7 100644

     

       126
       126
       -
       --- a/gcc/configure.ac

     

       127
       127
       -
       +++ b/gcc/configure.ac

     

       128
       128
       -
       @@ -1612,7 +1612,7 @@ case ${enable_threads} in

     

       129
       129
       -
            target_thread_file='single'

     

       130
       130
       -
            ;;

     

       131
       131
       -
          aix | dce | lynx | mipssde | posix | rtems | \

     

       132
       132
       -
       -  single | tpf | vxworks | win32)

     

       133
       133
       -
       +  single | tpf | vxworks | win32 | mcf)

     

       134
       134
       -
            target_thread_file=${enable_threads}

     

       135
       135
       -
            ;;

     

       136
       136
       -
          *)

     

       137
       137
       -
       diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt

     

       138
       138
       -
       index ea8c34f8c71..23134ad7363 100644

     

       139
       139
       -
       --- a/libatomic/configure.tgt

     

       140
       140
       -
       +++ b/libatomic/configure.tgt

     

       141
       141
       -
       @@ -145,7 +145,7 @@ case "${target}" in

     

       142
       142
       -
          *-*-mingw*)

     

       143
       143
       -
        	# OS support for atomic primitives.

     

       144
       144
       -
                case ${target_thread_file} in

     

       145
       145
       -
       -          win32)

     

       146
       146
       -
       +          win32 | mcf)

     

       147
       147
       -
                    config_path="${config_path} mingw"

     

       148
       148
       -
                    ;;

     

       149
       149
       -
                  posix)

     

       150
       150
       -
       diff --git a/libgcc/config.host b/libgcc/config.host

     

       151
       151
       -
       index 11b4acaff55..9fbd38650bd 100644

     

       152
       152
       -
       --- a/libgcc/config.host

     

       153
       153
       -
       +++ b/libgcc/config.host

     

       154
       154
       -
       @@ -737,6 +737,9 @@ i[34567]86-*-mingw*)

     

       155
       155
       -
        	  posix)

     

       156
       156
       -
        	    tmake_file="i386/t-mingw-pthread $tmake_file"

     

       157
       157
       -
        	    ;;

     

       158
       158
       -
       +	  mcf)

     

       159
       159
       -
       +	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"

     

       160
       160
       -
       +	    ;;

     

       161
       161
       -
        	esac

     

       162
       162
       -
        	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h

     

       163
       163
       -
        	if test x$ac_cv_sjlj_exceptions = xyes; then

     

       164
       164
       -
       @@ -761,6 +764,9 @@ x86_64-*-mingw*)

     

       165
       165
       -
        	  posix)

     

       166
       166
       -
        	    tmake_file="i386/t-mingw-pthread $tmake_file"

     

       167
       167
       -
        	    ;;

     

       168
       168
       -
       +	  mcf)

     

       169
       169
       -
       +	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"

     

       170
       170
       -
       +	    ;;

     

       171
       171
       -
        	esac

     

       172
       172
       -
        	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h

     

       173
       173
       -
        	if test x$ac_cv_sjlj_exceptions = xyes; then

     

       174
       174
       -
       diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h

     

       175
       175
       -
       new file mode 100644

     

       176
       176
       -
       index 00000000000..5ea2908361f

     

       177
       177
       -
       --- /dev/null

     

       178
       178
       -
       +++ b/libgcc/config/i386/gthr-mcf.h

     

       179
       179
       -
       @@ -0,0 +1 @@

     

       180
       180
       -
       +#include <mcfgthread/gthread.h>

     

       181
       181
       -
       diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread

     

       182
       182
       -
       new file mode 100644

     

       183
       183
       -
       index 00000000000..4b9b10e32d6

     

       184
       184
       -
       --- /dev/null

     

       185
       185
       -
       +++ b/libgcc/config/i386/t-mingw-mcfgthread

     

       186
       186
       -
       @@ -0,0 +1,2 @@

     

       187
       187
       -
       +SHLIB_PTHREAD_CFLAG =

     

       188
       188
       -
       +SHLIB_PTHREAD_LDFLAG = -lmcfgthread

     

       189
       189
       -
       diff --git a/libgcc/configure b/libgcc/configure

     

       190
       190
       -
       index b2f3f870844..eff889dc3b3 100644

     

       191
       191
       -
       --- a/libgcc/configure

     

       192
       192
       -
       +++ b/libgcc/configure

     

       193
       193
       -
       @@ -5451,6 +5451,7 @@ case $target_thread_file in

     

       194
       194
       -
            tpf)	thread_header=config/s390/gthr-tpf.h ;;

     

       195
       195
       -
            vxworks)	thread_header=config/gthr-vxworks.h ;;

     

       196
       196
       -
            win32)	thread_header=config/i386/gthr-win32.h ;;

     

       197
       197
       -
       +    mcf)	thread_header=config/i386/gthr-mcf.h ;;

     

       198
       198
       -
        esac

     

       199
       199
       -
        

     

       200
       200
       -
        

     

       201
       201
       -
       diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure

     

       202
       202
       -
       index ba094be6f15..979a5ab9ace 100755

     

       203
       203
       -
       --- a/libstdc++-v3/configure

     

       204
       204
       -
       +++ b/libstdc++-v3/configure

     

       205
       205
       -
       @@ -15187,6 +15187,7 @@ case $target_thread_file in

     

       206
       206
       -
            tpf)	thread_header=config/s390/gthr-tpf.h ;;

     

       207
       207
       -
            vxworks)	thread_header=config/gthr-vxworks.h ;;

     

       208
       208
       -
            win32)	thread_header=config/i386/gthr-win32.h ;;

     

       209
       209
       -
       +    mcf)	thread_header=config/i386/gthr-mcf.h ;;

     

       210
       210
       -
        esac

     

       211
       211
       -
        

     

       212
       212
       -
        

     

       213
       213
       -
       diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc

     

       214
       214
       -
       index de920d714c6..665fb74bd6b 100644

     

       215
       215
       -
       --- a/libstdc++-v3/libsupc++/atexit_thread.cc

     

       216
       216
       -
       +++ b/libstdc++-v3/libsupc++/atexit_thread.cc

     

       217
       217
       -
       @@ -25,6 +25,22 @@

     

       218
       218
       -
        #include <cstdlib>

     

       219
       219
       -
        #include <new>

     

       220
       220
       -
        #include "bits/gthr.h"

     

       221
       221
       -
       +

     

       222
       222
       -
       +#ifdef __USING_MCFGTHREAD__

     

       223
       223
       -
       +

     

       224
       224
       -
       +#include <mcfgthread/gthread.h>

     

       225
       225
       -
       +

     

       226
       226
       -
       +extern "C" int

     

       227
       227
       -
       +__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *),

     

       228
       228
       -
       +				 void *obj, void *dso_handle)

     

       229
       229
       -
       +  _GLIBCXX_NOTHROW

     

       230
       230
       -
       +{

     

       231
       231
       -
       +  return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;

     

       232
       232
       -
       +  (void)dso_handle;

     

       233
       233
       -
       +}

     

       234
       234
       -
       +

     

       235
       235
       -
       +#else // __USING_MCFGTHREAD__

     

       236
       236
       -
       +

     

       237
       237
       -
        #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32

     

       238
       238
       -
        #define WIN32_LEAN_AND_MEAN

     

       239
       239
       -
        #include <windows.h>

     

       240
       240
       -
       @@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha

     

       241
       241
       -
        }

     

       242
       242
       -
        

     

       243
       243
       -
        #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */

     

       244
       244
       -
       +

     

       245
       245
       -
       +#endif // __USING_MCFGTHREAD__

     

       246
       246
       -
       diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc

     

       247
       247
       -
       index 3a2ec3ad0d6..8b4cc96199b 100644

     

       248
       248
       -
       --- a/libstdc++-v3/libsupc++/guard.cc

     

       249
       249
       -
       +++ b/libstdc++-v3/libsupc++/guard.cc

     

       250
       250
       -
       @@ -28,6 +28,27 @@

     

       251
       251
       -
        #include <cxxabi.h>

     

       252
       252
       -
        #include <exception>

     

       253
       253
       -
        #include <new>

     

       254
       254
       -
       +

     

       255
       255
       -
       +#ifdef __USING_MCFGTHREAD__

     

       256
       256
       -
       +

     

       257
       257
       -
       +#include <mcfgthread/gthread.h>

     

       258
       258
       -
       +

     

       259
       259
       -
       +namespace __cxxabiv1 {

     

       260
       260
       -
       +

     

       261
       261
       -
       +extern "C" int __cxa_guard_acquire(__guard *g){

     

       262
       262
       -
       +	return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;

     

       263
       263
       -
       +}

     

       264
       264
       -
       +extern "C" void __cxa_guard_abort(__guard *g) throw() {

     

       265
       265
       -
       +	::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);

     

       266
       266
       -
       +}

     

       267
       267
       -
       +extern "C" void __cxa_guard_release(__guard *g) throw() {

     

       268
       268
       -
       +	::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);

     

       269
       269
       -
       +}

     

       270
       270
       -
       +

     

       271
       271
       -
       +}

     

       272
       272
       -
       +

     

       273
       273
       -
       +#else // __USING_MCFGTHREAD__

     

       274
       274
       -
       +

     

       275
       275
       -
        #include <ext/atomicity.h>

     

       276
       276
       -
        #include <ext/concurrence.h>

     

       277
       277
       -
        #include <bits/atomic_lockfree_defines.h>

     

       278
       278
       -
       @@ -425,3 +446,5 @@ namespace __cxxabiv1

     

       279
       279
       -
        #endif

     

       280
       280
       -
          }

     

       281
       281
       -
        }

     

       282
       282
       -
       +

     

       283
       283
       -
       +#endif

     

       284
       284
       -
       diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc

     

       285
       285
       -
       index 8238817c2e9..0c6a1f85f6f 100644

     

       286
       286
       -
       --- a/libstdc++-v3/src/c++11/thread.cc

     

       287
       287
       -
       +++ b/libstdc++-v3/src/c++11/thread.cc

     

       288
       288
       -
       @@ -55,6 +55,15 @@ static inline int get_nprocs()

     

       289
       289
       -
        #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)

     

       290
       290
       -
        # include <unistd.h>

     

       291
       291
       -
        # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)

     

       292
       292
       -
       +#elif defined(_WIN32)

     

       293
       293
       -
       +# include <windows.h>

     

       294
       294
       -
       +static inline int get_nprocs()

     

       295
       295
       -
       +{

     

       296
       296
       -
       +  SYSTEM_INFO sysinfo;

     

       297
       297
       -
       +  GetSystemInfo(&sysinfo);

     

       298
       298
       -
       +  return (int)sysinfo.dwNumberOfProcessors;

     

       299
       299
       -
       +}

     

       300
       300
       -
       +# define _GLIBCXX_NPROCS get_nprocs()

     

       301
       301
       -
        #else

     

       302
       302
       -
        # define _GLIBCXX_NPROCS 0

     

       303
       303
       -
        #endif

     

       304
       304
       -
       -- 

     

       305
       305
       -
       2.17.0

     

       306
       306
       -

-105

pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch

···

       1
       1
       -
       diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x

     

       2
       2
       -
       index 47a3578f017..6cf22d19b2a 100644

     

       3
       3
       -
       --- a/fixincludes/fixincl.x

     

       4
       4
       -
       +++ b/fixincludes/fixincl.x

     

       5
       5
       -
       @@ -3480,6 +3480,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {

     

       6
       6
       -
        #endif\n",

     

       7
       7
       -
            (char*)NULL };

     

       8
       8
       -
        

     

       9
       9
       -
       +/* * * * * * * * * * * * * * * * * * * * * * * * * *

     

       10
       10
       -
       + *

     

       11
       11
       -
       + *  Description of Darwin_Nix_Sdk_Availabilityinternal fix

     

       12
       12
       -
       + */

     

       13
       13
       -
       +tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =

     

       14
       14
       -
       +     "darwin_nix_sdk_availabilityinternal";

     

       15
       15
       -
       +

     

       16
       16
       -
       +/*

     

       17
       17
       -
       + *  File name selection pattern

     

       18
       18
       -
       + */

     

       19
       19
       -
       +tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =

     

       20
       20
       -
       +  "AvailabilityInternal.h\0";

     

       21
       21
       -
       +/*

     

       22
       22
       -
       + *  Machine/OS name selection pattern

     

       23
       23
       -
       + */

     

       24
       24
       -
       +tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {

     

       25
       25
       -
       +        "*-*-darwin*",

     

       26
       26
       -
       +        (const char*)NULL };

     

       27
       27
       -
       +

     

       28
       28
       -
       +/*

     

       29
       29
       -
       + *  content selection pattern - do fix if pattern found

     

       30
       30
       -
       + */

     

       31
       31
       -
       +tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =

     

       32
       32
       -
       +       "(.*)__has_builtin\\(__is_target_os\\)(.*)";

     

       33
       33
       -
       +

     

       34
       34
       -
       +#define    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT  1

     

       35
       35
       -
       +static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {

     

       36
       36
       -
       +  { TT_EGREP,    zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };

     

       37
       37
       -
       +

     

       38
       38
       -
       +/*

     

       39
       39
       -
       + *  Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal

     

       40
       40
       -
       + */

     

       41
       41
       -
       +static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {

     

       42
       42
       -
       +    "format",

     

       43
       43
       -
       +    "%10%2",

     

       44
       44
       -
       +    (char*)NULL };

     

       45
       45
       -
       +

     

       46
       46
       -
        /* * * * * * * * * * * * * * * * * * * * * * * * * *

     

       47
       47
       -
         *

     

       48
       48
       -
         *  Description of Dec_Intern_Asm fix

     

       49
       49
       -
       @@ -10445,9 +10482,9 @@ static const char* apzX11_SprintfPatch[] = {

     

       50
       50
       -
         *

     

       51
       51
       -
         *  List of all fixes

     

       52
       52
       -
         */

     

       53
       53
       -
       -#define REGEX_COUNT          296

     

       54
       54
       -
       +#define REGEX_COUNT          297

     

       55
       55
       -
        #define MACH_LIST_SIZE_LIMIT 187

     

       56
       56
       -
       -#define FIX_COUNT            257

     

       57
       57
       -
       +#define FIX_COUNT            258

     

       58
       58
       -
        

     

       59
       59
       -
        /*

     

       60
       60
       -
         *  Enumerate the fixes

     

       61
       61
       -
       @@ -10535,6 +10572,7 @@ typedef enum {

     

       62
       62
       -
            DARWIN_STDINT_6_FIXIDX,

     

       63
       63
       -
            DARWIN_STDINT_7_FIXIDX,

     

       64
       64
       -
            DARWIN_UCRED__ATOMIC_FIXIDX,

     

       65
       65
       -
       +    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,

     

       66
       66
       -
            DEC_INTERN_ASM_FIXIDX,

     

       67
       67
       -
            DJGPP_WCHAR_H_FIXIDX,

     

       68
       68
       -
            ECD_CURSOR_FIXIDX,

     

       69
       69
       -
       @@ -11123,6 +11161,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {

     

       70
       70
       -
             DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

     

       71
       71
       -
             aDarwin_Ucred__AtomicTests,   apzDarwin_Ucred__AtomicPatch, 0 },

     

       72
       72
       -
        

     

       73
       73
       -
       +  {  zDarwin_Nix_Sdk_AvailabilityinternalName,    zDarwin_Nix_Sdk_AvailabilityinternalList,

     

       74
       74
       -
       +     apzDarwin_Nix_Sdk_AvailabilityinternalMachs,

     

       75
       75
       -
       +     DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

     

       76
       76
       -
       +     aDarwin_Nix_Sdk_AvailabilityinternalTests,   apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },

     

       77
       77
       -
       +

     

       78
       78
       -
          {  zDec_Intern_AsmName,    zDec_Intern_AsmList,

     

       79
       79
       -
             apzDec_Intern_AsmMachs,

     

       80
       80
       -
             DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,

     

       81
       81
       -
       diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def

     

       82
       82
       -
       index bf136fdaa20..89bceb46c26 100644

     

       83
       83
       -
       --- a/fixincludes/inclhack.def

     

       84
       84
       -
       +++ b/fixincludes/inclhack.def

     

       85
       85
       -
       @@ -1727,6 +1727,20 @@ fix = {

     

       86
       86
       -
            test_text = ""; /* Don't provide this for wrap fixes.  */

     

       87
       87
       -
        };

     

       88
       88
       -
        

     

       89
       89
       -
       +/*

     

       90
       90
       -
       + * Newer versions of AvailabilityInternal.h use `__has_builtin`,

     

       91
       91
       -
       + * which is not implemented in or compatible with GCC.

     

       92
       92
       -
       + */

     

       93
       93
       -
       +fix = {

     

       94
       94
       -
       +    hackname  = darwin_nix_sdk_availabilityinternal;

     

       95
       95
       -
       +    mach      = "*-*-darwin*";

     

       96
       96
       -
       +    files     = AvailabilityInternal.h;

     

       97
       97
       -
       +    c_fix     = format;

     

       98
       98
       -
       +    c_fix_arg = "%10%2";

     

       99
       99
       -
       +    select    = "(.*)__has_builtin\\(__is_target_os\\)(.*)";

     

       100
       100
       -
       +    test_text = "__has_builtin(__is_target_os)";

     

       101
       101
       -
       +};

     

       102
       102
       -
       +

     

       103
       103
       -
        /*

     

       104
       104
       -
         *  Fix <c_asm.h> on Digital UNIX V4.0:

     

       105
       105
       -
         *  It contains a prototype for a DEC C internal asm() function,

-31

pkgs/development/compilers/gcc/patches/9/fix-struct-redefinition-on-glibc-2.36.patch

···

       1
       1
       -
       Derived from ../11/fix-struct-redefinition-on-glibc-2.36.patch (upstream commit d2356ebb0084a0d80dbfe33040c9afe938c15d19)

     

       2
       2
       -
       

     

       3
       3
       -
       diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       4
       4
       -
       index e8fce8a02..cb1ac806e 100644

     

       5
       5
       -
       --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       6
       6
       -
       +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       7
       7
       -
       @@ -65,7 +65,9 @@

     

       8
       8
       -
        #include <sys/vt.h>

     

       9
       9
       -
        #include <linux/cdrom.h>

     

       10
       10
       -
        #include <linux/fd.h>

     

       11
       11
       -
       +#if SANITIZER_ANDROID

     

       12
       12
       -
        #include <linux/fs.h>

     

       13
       13
       -
       +#endif

     

       14
       14
       -
        #include <linux/hdreg.h>

     

       15
       15
       -
        #include <linux/input.h>

     

       16
       16
       -
        #include <linux/ioctl.h>

     

       17
       17
       -
       @@ -846,10 +848,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);

     

       18
       18
       -
          unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;

     

       19
       19
       -
          unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;

     

       20
       20
       -
        #endif

     

       21
       21
       -
       -  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;

     

       22
       22
       -
       -  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;

     

       23
       23
       -
       -  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;

     

       24
       24
       -
       -  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;

     

       25
       25
       -
       +  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);

     

       26
       26
       -
       +  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);

     

       27
       27
       -
       +  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);

     

       28
       28
       -
       +  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);

     

       29
       29
       -
          unsigned IOCTL_GIO_CMAP = GIO_CMAP;

     

       30
       30
       -
          unsigned IOCTL_GIO_FONT = GIO_FONT;

     

       31
       31
       -
          unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;

-99

pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch

···

       1
       1
       -
       Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982

     

       2
       2
       -
       

     

       3
       3
       -
       diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h

     

       4
       4
       -
       --- a/gcc/config/darwin.h	2022-05-27 03:21:10.947379000 -0400

     

       5
       5
       -
       +++ b/gcc/config/darwin.h	2023-11-06 12:18:27.209236423 -0500

     

       6
       6
       -
       @@ -230,12 +230,18 @@

     

       7
       7
       -
        

     

       8
       8
       -
        #define DSYMUTIL "\ndsymutil"

     

       9
       9
       -
        

     

       10
       10
       -
       +/* Spec that controls whether the debug linker is run automatically for

     

       11
       11
       -
       +   a link step.  This needs to be done if there is a source file on the

     

       12
       12
       -
       +   command line which will result in a temporary object (and debug is

     

       13
       13
       -
       +   enabled).  */

     

       14
       14
       -
       +

     

       15
       15
       -
        #define DSYMUTIL_SPEC \

     

       16
       16
       -
           "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\

     

       17
       17
       -
            %{v} \

     

       18
       18
       -
       -    %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\

     

       19
       19
       -
       -    %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \

     

       20
       20
       -
       -    %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"

     

       21
       21
       -
       +    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\

     

       22
       22
       -
       +    %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\

     

       23
       23
       -
       +      .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \

     

       24
       24
       -
       +    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"

     

       25
       25
       -
        

     

       26
       26
       -
        #define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC

     

       27
       27
       -
        

     

       28
       28
       -
       @@ -463,21 +469,31 @@

     

       29
       29
       -
          %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \

     

       30
       30
       -
          %{static}" ASM_MMACOSX_VERSION_MIN_SPEC

     

       31
       31
       -
        

     

       32
       32
       -
       -/* Default ASM_DEBUG_SPEC.  Darwin's as cannot currently produce dwarf

     

       33
       33
       -
       -   debugging data.  */

     

       34
       34
       -
       -

     

       35
       35
       -
       +#ifdef HAS_AS_STABS_DIRECTIVE

     

       36
       36
       -
       +/* We only pass a debug option to the assembler if that supports stabs, since

     

       37
       37
       -
       +   dwarf is not uniformly supported in the assemblers.  */

     

       38
       38
       -
        #define ASM_DEBUG_SPEC  "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}"

     

       39
       39
       -
       +#else

     

       40
       40
       -
       +#define ASM_DEBUG_SPEC ""

     

       41
       41
       -
       +#endif

     

       42
       42
       -
       +

     

       43
       43
       -
       +#undef  ASM_DEBUG_OPTION_SPEC

     

       44
       44
       -
       +#define ASM_DEBUG_OPTION_SPEC  ""

     

       45
       45
       -
       +

     

       46
       46
       -
        #define ASM_FINAL_SPEC \

     

       47
       47
       -
          "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} %<gsplit-dwarf"

     

       48
       48
       -
        

     

       49
       49
       -
       -/* We still allow output of STABS if the assembler supports it.  */

     

       50
       50
       -
       +/* We now require C++11 to bootstrap and newer tools than those based on

     

       51
       51
       -
       +   stabs, so require DWARF-2, even if stabs is supported by the assembler.  */

     

       52
       52
       -
       +

     

       53
       53
       -
       +#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG

     

       54
       54
       -
       +#define DARWIN_PREFER_DWARF

     

       55
       55
       -
       +#define DWARF2_DEBUGGING_INFO 1

     

       56
       56
       -
       +

     

       57
       57
       -
        #ifdef HAVE_AS_STABS_DIRECTIVE

     

       58
       58
       -
        #define DBX_DEBUGGING_INFO 1

     

       59
       59
       -
       -#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG

     

       60
       60
       -
        #endif

     

       61
       61
       -
        

     

       62
       62
       -
       -#define DWARF2_DEBUGGING_INFO 1

     

       63
       63
       -
       -

     

       64
       64
       -
        #define DEBUG_FRAME_SECTION	  "__DWARF,__debug_frame,regular,debug"

     

       65
       65
       -
        #define DEBUG_INFO_SECTION	  "__DWARF,__debug_info,regular,debug"

     

       66
       66
       -
        #define DEBUG_ABBREV_SECTION	  "__DWARF,__debug_abbrev,regular,debug"

     

       67
       67
       -
       diff -ur a/gcc/config/darwin9.h b/gcc/config/darwin9.h

     

       68
       68
       -
       --- a/gcc/config/darwin9.h	2022-05-27 03:21:10.947379000 -0400

     

       69
       69
       -
       +++ b/gcc/config/darwin9.h	2023-11-06 12:18:48.325260590 -0500

     

       70
       70
       -
       @@ -18,29 +18,6 @@

     

       71
       71
       -
        along with GCC; see the file COPYING3.  If not see

     

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

     

       73
       73
       -
        

     

       74
       74
       -
       -/* Prefer DWARF2.  */

     

       75
       75
       -
       -#undef PREFERRED_DEBUGGING_TYPE

     

       76
       76
       -
       -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG

     

       77
       77
       -
       -#define DARWIN_PREFER_DWARF

     

       78
       78
       -
       -

     

       79
       79
       -
       -/* Since DWARF2 is default, conditions for running dsymutil are different.  */

     

       80
       80
       -
       -#undef DSYMUTIL_SPEC

     

       81
       81
       -
       -#define DSYMUTIL_SPEC \

     

       82
       82
       -
       -   "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\

     

       83
       83
       -
       -    %{v} \

     

       84
       84
       -
       -    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\

     

       85
       85
       -
       -    %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \

     

       86
       86
       -
       -    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"

     

       87
       87
       -
       -

     

       88
       88
       -
       -/* Tell collect2 to run dsymutil for us as necessary.  */

     

       89
       89
       -
       -#define COLLECT_RUN_DSYMUTIL 1

     

       90
       90
       -
       -

     

       91
       91
       -
       -/* Only ask as for debug data if the debug style is stabs (since as doesn't

     

       92
       92
       -
       -   yet generate dwarf.)  */

     

       93
       93
       -
       -

     

       94
       94
       -
       -#undef  ASM_DEBUG_SPEC

     

       95
       95
       -
       -#define ASM_DEBUG_SPEC  "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}"

     

       96
       96
       -
       -

     

       97
       97
       -
        #undef  ASM_OUTPUT_ALIGNED_COMMON

     

       98
       98
       -
        #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN)		\

     

       99
       99
       -
          do {									\

+1 -24

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

···

       32
       32
        
         atLeast13 = lib.versionAtLeast version "13";

     

       33
       33
        
         atLeast12 = lib.versionAtLeast version "12";

     

       34
       34
        
         atLeast11 = lib.versionAtLeast version "11";

     

       35
       35
       -
         atLeast10 = lib.versionAtLeast version "10";

     

       36
       35
        
         is15 = majorVersion == "15";

     

       37
       36
        
         is14 = majorVersion == "14";

     

       38
       37
        
         is13 = majorVersion == "13";

     

       39
       38
        
         is12 = majorVersion == "12";

     

       40
       39
        
         is11 = majorVersion == "11";

     

       41
       40
        
         is10 = majorVersion == "10";

     

       42
       42
       -
         is9 = majorVersion == "9";

     

       43
       41
        
       

     

       44
       42
        
         # We only apply these patches when building a native toolchain for

     

       45
       43
        
         # aarch64-darwin, as it breaks building a foreign one:

     
···

       99
       97
        
             ];

     

       100
       98
        
             "11" = [ ./no-sys-dirs-riscv.patch ];

     

       101
       99
        
             "10" = [ ./no-sys-dirs-riscv.patch ];

     

       102
       102
       -
             "9" = [ ./no-sys-dirs-riscv-gcc9.patch ];

     

       103
       100
        
           }

     

       104
       101
        
           ."${majorVersion}" or [ ]

     

       105
       102
        
         )

     
···

       283
       280
        
         .${majorVersion} or [ ]

     

       284
       281
        
       )

     

       285
       282
        
       

     

       286
       286
       -
       # Work around newer AvailabilityInternal.h when building older versions of GCC.

     

       287
       287
       -
       ++ optionals (stdenv.hostPlatform.isDarwin) (

     

       288
       288
       -
         {

     

       289
       289
       -
           "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ];

     

       290
       290
       -
         }

     

       291
       291
       -
         .${majorVersion} or [ ]

     

       292
       292
       -
       )

     

       293
       293
       -
       

     

       294
       283
        
       ## Windows

     

       295
       284
        
       

     

       296
       285
        
       # Backported mcf thread model support from gcc13:

     
···

       321
       310
        
       ## gcc 10.0 and older ##############################################################################

     

       322
       311
        
       

     

       323
       312
        
       # Probably needed for gnat wrapper https://github.com/NixOS/nixpkgs/pull/62314

     

       324
       324
       -
       ++ optional (langAda && (is9 || is10)) ./gnat-cflags.patch

     

       313
       313
       +
       ++ optional (langAda && is10) ./gnat-cflags.patch

     

       325
       314
        
       ++

     

       326
       315
        
         # Backport native aarch64-darwin compilation fix from gcc12

     

       327
       316
        
         # https://github.com/NixOS/nixpkgs/pull/167595

     
···

       341
       330
        
       ++ optional (

     

       342
       331
        
         !atLeast11 && stdenv.cc.isClang && stdenv.hostPlatform.isDarwin

     

       343
       332
        
       ) ./clang-genconditions.patch

     

       344
       344
       -
       

     

       345
       345
       -
       ## gcc 9.0 and older ##############################################################################

     

       346
       346
       -
       

     

       347
       347
       -
       ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch

     

       348
       348
       -
       # Needed for NetBSD cross comp in older versions

     

       349
       349
       -
       # https://gcc.gnu.org/pipermail/gcc-patches/2020-January/thread.html#537548

     

       350
       350
       -
       # https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=98d56ea8900fdcff8f1987cf2bf499a5b7399857

     

       351
       351
       -
       ++ optional (!atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch

     

       352
       352
       -
       

     

       353
       353
       -
       # Make Darwin bootstrap respect whether the assembler supports `--gstabs`,

     

       354
       354
       -
       # which is not supported by the clang integrated assembler used by default on Darwin.

     

       355
       355
       -
       ++ optional (is9 && hostPlatform.isDarwin) ./9/gcc9-darwin-as-gstabs.patch

-141

pkgs/development/compilers/gcc/patches/libstdc++-netbsd-ctypes.patch

···

       1
       1
       -
       diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h

     

       2
       2
       -
       index ff3ec893974..21eccf9fde1 100644

     

       3
       3
       -
       --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h

     

       4
       4
       -
       +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h

     

       5
       5
       -
       @@ -38,40 +38,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION

     

       6
       6
       -
          /// @brief  Base class for ctype.

     

       7
       7
       -
          struct ctype_base

     

       8
       8
       -
          {

     

       9
       9
       -
       -    // Non-standard typedefs.

     

       10
       10
       -
       -    typedef const unsigned char*	__to_type;

     

       11
       11
       -
        

     

       12
       12
       -
            // NB: Offsets into ctype<char>::_M_table force a particular size

     

       13
       13
       -
            // on the mask type. Because of this, we don't use an enum.

     

       14
       14
       -
       -    typedef unsigned char      	mask;

     

       15
       15
       -
        

     

       16
       16
       -
        #ifndef _CTYPE_U

     

       17
       17
       -
       -    static const mask upper    	= _U;

     

       18
       18
       -
       -    static const mask lower 	= _L;

     

       19
       19
       -
       -    static const mask alpha 	= _U | _L;

     

       20
       20
       -
       -    static const mask digit 	= _N;

     

       21
       21
       -
       -    static const mask xdigit 	= _N | _X;

     

       22
       22
       -
       -    static const mask space 	= _S;

     

       23
       23
       -
       -    static const mask print 	= _P | _U | _L | _N | _B;

     

       24
       24
       -
       -    static const mask graph 	= _P | _U | _L | _N;

     

       25
       25
       -
       -    static const mask cntrl 	= _C;

     

       26
       26
       -
       -    static const mask punct 	= _P;

     

       27
       27
       -
       -    static const mask alnum 	= _U | _L | _N;

     

       28
       28
       -
       +    // Non-standard typedefs.

     

       29
       29
       -
       +    typedef const unsigned char*	__to_type;

     

       30
       30
       -
       +

     

       31
       31
       -
       +    typedef unsigned char	mask;

     

       32
       32
       -
       +

     

       33
       33
       -
       +    static const mask upper	= _U;

     

       34
       34
       -
       +    static const mask lower	= _L;

     

       35
       35
       -
       +    static const mask alpha	= _U | _L;

     

       36
       36
       -
       +    static const mask digit	= _N;

     

       37
       37
       -
       +    static const mask xdigit	= _N | _X;

     

       38
       38
       -
       +    static const mask space	= _S;

     

       39
       39
       -
       +    static const mask print	= _P | _U | _L | _N | _B;

     

       40
       40
       -
       +    static const mask graph	= _P | _U | _L | _N;

     

       41
       41
       -
       +    static const mask cntrl	= _C;

     

       42
       42
       -
       +    static const mask punct	= _P;

     

       43
       43
       -
       +    static const mask alnum	= _U | _L | _N;

     

       44
       44
       -
        #else

     

       45
       45
       -
       -    static const mask upper    	= _CTYPE_U;

     

       46
       46
       -
       -    static const mask lower 	= _CTYPE_L;

     

       47
       47
       -
       -    static const mask alpha 	= _CTYPE_U | _CTYPE_L;

     

       48
       48
       -
       -    static const mask digit 	= _CTYPE_N;

     

       49
       49
       -
       -    static const mask xdigit 	= _CTYPE_N | _CTYPE_X;

     

       50
       50
       -
       -    static const mask space 	= _CTYPE_S;

     

       51
       51
       -
       -    static const mask print 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;

     

       52
       52
       -
       -    static const mask graph 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;

     

       53
       53
       -
       -    static const mask cntrl 	= _CTYPE_C;

     

       54
       54
       -
       -    static const mask punct 	= _CTYPE_P;

     

       55
       55
       -
       -    static const mask alnum 	= _CTYPE_U | _CTYPE_L | _CTYPE_N;

     

       56
       56
       -
       +    typedef const unsigned short*	__to_type;

     

       57
       57
       -
       +

     

       58
       58
       -
       +    typedef unsigned short	mask;

     

       59
       59
       -
       +

     

       60
       60
       -
       +    static const mask upper	= _CTYPE_U;

     

       61
       61
       -
       +    static const mask lower	= _CTYPE_L;

     

       62
       62
       -
       +    static const mask alpha	= _CTYPE_A;

     

       63
       63
       -
       +    static const mask digit	= _CTYPE_D;

     

       64
       64
       -
       +    static const mask xdigit	= _CTYPE_X;

     

       65
       65
       -
       +    static const mask space	= _CTYPE_S;

     

       66
       66
       -
       +    static const mask print	= _CTYPE_R;

     

       67
       67
       -
       +    static const mask graph	= _CTYPE_G;

     

       68
       68
       -
       +    static const mask cntrl	= _CTYPE_C;

     

       69
       69
       -
       +    static const mask punct	= _CTYPE_P;

     

       70
       70
       -
       +    static const mask alnum	= _CTYPE_A | _CTYPE_D;

     

       71
       71
       -
        #endif

     

       72
       72
       -
        #if __cplusplus >= 201103L

     

       73
       73
       -
       -    static const mask blank 	= space;

     

       74
       74
       -
       +    static const mask blank	= space;

     

       75
       75
       -
        #endif

     

       76
       76
       -
          };

     

       77
       77
       -
        

     

       78
       78
       -
       diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc

     

       79
       79
       -
       index ed3b7cd0d6a..33358e8f5d8 100644

     

       80
       80
       -
       --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc

     

       81
       81
       -
       +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc

     

       82
       82
       -
       @@ -38,11 +38,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION

     

       83
       83
       -
        

     

       84
       84
       -
        // Information as gleaned from /usr/include/ctype.h

     

       85
       85
       -
        

     

       86
       86
       -
       -  extern "C" const u_int8_t _C_ctype_[];

     

       87
       87
       -
       -

     

       88
       88
       -
          const ctype_base::mask*

     

       89
       89
       -
          ctype<char>::classic_table() throw()

     

       90
       90
       -
       -  { return _C_ctype_ + 1; }

     

       91
       91
       -
       +  { return _C_ctype_tab_ + 1; }

     

       92
       92
       -
        

     

       93
       93
       -
          ctype<char>::ctype(__c_locale, const mask* __table, bool __del,

     

       94
       94
       -
        		     size_t __refs)

     

       95
       95
       -
       @@ -69,14 +67,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION

     

       96
       96
       -
        

     

       97
       97
       -
          char

     

       98
       98
       -
          ctype<char>::do_toupper(char __c) const

     

       99
       99
       -
       -  { return ::toupper((int) __c); }

     

       100
       100
       -
       +  { return ::toupper((int)(unsigned char) __c); }

     

       101
       101
       -
        

     

       102
       102
       -
          const char*

     

       103
       103
       -
          ctype<char>::do_toupper(char* __low, const char* __high) const

     

       104
       104
       -
          {

     

       105
       105
       -
            while (__low < __high)

     

       106
       106
       -
              {

     

       107
       107
       -
       -	*__low = ::toupper((int) *__low);

     

       108
       108
       -
       +	*__low = ::toupper((int)(unsigned char) *__low);

     

       109
       109
       -
        	++__low;

     

       110
       110
       -
              }

     

       111
       111
       -
            return __high;

     

       112
       112
       -
       @@ -84,14 +82,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION

     

       113
       113
       -
        

     

       114
       114
       -
          char

     

       115
       115
       -
          ctype<char>::do_tolower(char __c) const

     

       116
       116
       -
       -  { return ::tolower((int) __c); }

     

       117
       117
       -
       +  { return ::tolower((int)(unsigned char) __c); }

     

       118
       118
       -
        

     

       119
       119
       -
          const char*

     

       120
       120
       -
          ctype<char>::do_tolower(char* __low, const char* __high) const

     

       121
       121
       -
          {

     

       122
       122
       -
            while (__low < __high)

     

       123
       123
       -
              {

     

       124
       124
       -
       -	*__low = ::tolower((int) *__low);

     

       125
       125
       -
       +	*__low = ::tolower((int)(unsigned char) *__low);

     

       126
       126
       -
        	++__low;

     

       127
       127
       -
              }

     

       128
       128
       -
            return __high;

     

       129
       129
       -
       diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h

     

       130
       130
       -
       index ace1120fba2..3234ce17c70 100644

     

       131
       131
       -
       --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h

     

       132
       132
       -
       +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h

     

       133
       133
       -
       @@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION

     

       134
       134
       -
          is(const char* __low, const char* __high, mask* __vec) const

     

       135
       135
       -
          {

     

       136
       136
       -
            while (__low < __high)

     

       137
       137
       -
       -      *__vec++ = _M_table[*__low++];

     

       138
       138
       -
       +      *__vec++ = _M_table[(unsigned char)*__low++];

     

       139
       139
       -
            return __high;

     

       140
       140
       -
          }

     

       141
       141
       -

-17

pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv-gcc9.patch

···

       1
       1
       -
       diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h

     

       2
       2
       -
       index 701f5ea1544..8de333caf54 100644

     

       3
       3
       -
       --- a/gcc/config/riscv/riscv.h

     

       4
       4
       -
       +++ b/gcc/config/riscv/riscv.h

     

       5
       5
       -
       @@ -886,11 +886,7 @@ extern unsigned riscv_stack_boundary;

     

       6
       6
       -
          "%{mabi=lp64f:lp64f}" \

     

       7
       7
       -
          "%{mabi=lp64d:lp64d}" \

     

       8
       8
       -
        

     

       9
       9
       -
       -#define STARTFILE_PREFIX_SPEC 			\

     

       10
       10
       -
       -   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\

     

       11
       11
       -
       -   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\

     

       12
       12
       -
       -   "/lib/ "					\

     

       13
       13
       -
       -   "/usr/lib/ "

     

       14
       14
       -
       +#define STARTFILE_PREFIX_SPEC ""

     

       15
       15
       -
        

     

       16
       16
       -
        /* ISA constants needed for code generation.  */

     

       17
       17
       -
        #define OPCODE_LW    0x2003

-2

pkgs/development/compilers/gcc/versions.nix

···

       6
       6
        
           "12" = "12.4.0";

     

       7
       7
        
           "11" = "11.5.0";

     

       8
       8
        
           "10" = "10.5.0";

     

       9
       9
       -
           "9" = "9.5.0";

     

       10
       9
        
         };

     

       11
       10
        
       

     

       12
       11
        
         fromMajorMinor = majorMinorVersion: majorMinorToVersionMap."${majorMinorVersion}";

     
···

       23
       22
        
             "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";

     

       24
       23
        
             "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";

     

       25
       24
        
             "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E=";

     

       26
       26
       -
             "9.5.0" = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7";

     

       27
       25
        
           }

     

       28
       26
        
           ."${version}";

     

       29
       27

pkgs/top-level/aliases.nix

···

       948
       948
        
         gcc7Stdenv = throw "gcc7Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20

     

       949
       949
        
         gcc8 = throw "gcc8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20

     

       950
       950
        
         gcc8Stdenv = throw "gcc8Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20

     

       951
       951
       +
         gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08

     

       952
       952
       +
         gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08

     

       951
       953
        
         gcc10StdenvCompat =

     

       952
       954
        
           if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21

     

       953
       955
        
         gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12

     
···

       968
       970
        
         gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11

     

       969
       971
        
         gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20

     

       970
       972
        
         gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20

     

       973
       973
       +
         gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08

     

       971
       974
        
         gg = go-graft; # Added 2025-03-07

     

       972
       975
        
         ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18

     

       973
       976
        
         ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18

-2

pkgs/top-level/all-packages.nix

···

       4861
       4861
        
               extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;

     

       4862
       4862
        
             };

     

       4863
       4863
        
       

     

       4864
       4864
       -
         gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9;

     

       4865
       4864
        
         gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10;

     

       4866
       4865
        
         gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;

     

       4867
       4866
        
         gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;

     
···

       4966
       4965
        
             });

     

       4967
       4966
        
       

     

       4968
       4967
        
         inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })

     

       4969
       4969
       -
           gcc9

     

       4970
       4968
        
           gcc10

     

       4971
       4969
        
           gcc11

     

       4972
       4970
        
           gcc12