commit 2de1b4b14e17f42ba8b4bf43a29347c91511e008 · pyrox.dev/nixpkgs

+16

pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-09-1.diff

···

       1
       1
       +
       this patch fixes build for clang-18+

     

       2
       2
       +
       

     

       3
       3
       +
       diff --git a/libgcc/config/aarch64/lse.S b/libgcc/config/aarch64/lse.S

     

       4
       4
       +
       index d3235bc33..1a56eb61c 100644

     

       5
       5
       +
       --- a/libgcc/config/aarch64/lse.S

     

       6
       6
       +
       +++ b/libgcc/config/aarch64/lse.S

     

       7
       7
       +
       @@ -170,8 +170,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see

     

       8
       8
       +
        	.globl	\name

     

       9
       9
       +
        	.hidden	\name

     

       10
       10
       +
        	.type	\name, %function

     

       11
       11
       +
       -	.cfi_startproc

     

       12
       12
       +
        \name:

     

       13
       13
       +
       +	.cfi_startproc

     

       14
       14
       +
        	BTI_C

     

       15
       15
       +
        .endm

     

       16
       16
       +

+16

pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-14-1.diff

···

       1
       1
       +
       this patch fixes build for clang-18+

     

       2
       2
       +
       

     

       3
       3
       +
       diff --git a/libgcc/config/aarch64/lse.S b/libgcc/config/aarch64/lse.S

     

       4
       4
       +
       index ecef47086..b478dd4d9 100644

     

       5
       5
       +
       --- a/libgcc/config/aarch64/lse.S

     

       6
       6
       +
       +++ b/libgcc/config/aarch64/lse.S

     

       7
       7
       +
       @@ -174,8 +174,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see

     

       8
       8
       +
        	.globl	\name

     

       9
       9
       +
        	HIDDEN(\name)

     

       10
       10
       +
        	SYMBOL_TYPE(\name, %function)

     

       11
       11
       +
       -	.cfi_startproc

     

       12
       12
       +
        \name:

     

       13
       13
       +
       +	.cfi_startproc

     

       14
       14
       +
        .endm

     

       15
       15
       +
        

     

       16
       16
       +
        .macro	ENDFN name

+16

pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-2.diff

···

       1
       1
       +
       this patch fixes build for clang-18+

     

       2
       2
       +
       

     

       3
       3
       +
       diff --git a/libgcc/config/aarch64/lse.S b/libgcc/config/aarch64/lse.S

     

       4
       4
       +
       index d3235bc33..1a56eb61c 100644

     

       5
       5
       +
       --- a/libgcc/config/aarch64/lse.S

     

       6
       6
       +
       +++ b/libgcc/config/aarch64/lse.S

     

       7
       7
       +
       @@ -197,8 +197,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see

     

       8
       8
       +
        	.text

     

       9
       9
       +
        	.balign	16

     

       10
       10
       +
        	.private_extern	_\name

     

       11
       11
       +
       -	.cfi_startproc

     

       12
       12
       +
        _\name:

     

       13
       13
       +
       +	.cfi_startproc

     

       14
       14
       +
        	BTI_C

     

       15
       15
       +
        .endm

     

       16
       16
       +

+16 -7

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

···

       40
       40
        
         is9  = majorVersion == "9";

     

       41
       41
        
         is8  = majorVersion == "8";

     

       42
       42
        
         is7  = majorVersion == "7";

     

       43
       43
       +
       

     

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

     

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

     

       46
       46
       +
         # https://github.com/iains/gcc-12-branch/issues/18

     

       47
       47
       +
         canApplyIainsDarwinPatches = stdenv.hostPlatform.isDarwin

     

       48
       48
       +
           && stdenv.hostPlatform.isAarch64

     

       49
       49
       +
           && buildPlatform == hostPlatform

     

       50
       50
       +
           && hostPlatform == targetPlatform;

     

       51
       51
       +
       

     

       43
       52
        
         inherit (lib) optionals optional;

     

       44
       53
        
       in

     

       45
       54
        
       

     
···

       71
       80
        
       ++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch)

     

       72
       81
        
       ++ [ ./ppc-musl.patch ]

     

       73
       82
        
       ++ optional (atLeast9 && langD) ./libphobos.patch

     

       83
       83
       +
       ++ optional (atLeast9 && !atLeast14) ./cfi_startproc-reorder-label-09-1.diff

     

       84
       84
       +
       ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff

     

       74
       85
        
       

     

       75
       86
        
       

     

       76
       87
        
       

     
···

       135
       146
        
         "12" = [ ./gnat-darwin-dylib-install-name.patch ];

     

       136
       147
        
       }.${majorVersion} or [])

     

       137
       148
        
       

     

       138
       138
       -
       # We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building

     

       139
       139
       -
       # a foreign one: https://github.com/iains/gcc-12-branch/issues/18

     

       140
       140
       -
       ++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({

     

       149
       149
       +
       ++ optionals canApplyIainsDarwinPatches ({

     

       141
       150
        
         "14" = [

     

       142
       151
        
           (fetchpatch {

     

       143
       152
        
             name = "gcc-14-darwin-aarch64-support.patch";

     
···

       159
       168
        
           name = "gcc-13-darwin-aarch64-support.patch";

     

       160
       169
        
           url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff";

     

       161
       170
        
           sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo=";

     

       162
       162
       -
         }) ];

     

       171
       171
       +
         }) ./cfi_startproc-reorder-label-2.diff ];

     

       163
       172
        
         "12" = [ (fetchurl {

     

       164
       173
        
           name = "gcc-12-darwin-aarch64-support.patch";

     

       165
       174
        
           url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff";

     

       166
       175
        
           sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw=";

     

       167
       167
       -
         }) ];

     

       176
       176
       +
         }) ./cfi_startproc-reorder-label-2.diff ];

     

       168
       177
        
         "11" = [ (fetchpatch {

     

       169
       178
        
           # There are no upstream release tags in https://github.com/iains/gcc-11-branch.

     

       170
       179
        
           # 5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.5.0

     

       171
       180
        
           url = "https://github.com/iains/gcc-11-branch/compare/5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6..gcc-11.5-darwin-r0.diff";

     

       172
       181
        
           hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE=";

     

       173
       173
       -
         }) ];

     

       182
       182
       +
         }) ./cfi_startproc-reorder-label-2.diff ];

     

       174
       183
        
         "10" = [ (fetchpatch {

     

       175
       184
        
           # There are no upstream release tags in https://github.com/iains/gcc-10-branch.

     

       176
       185
        
           # d04fe55 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0

     

       177
       186
        
           url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...gcc-10-5Dr0-pre-0.diff";

     

       178
       187
        
           hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk=";

     

       179
       179
       -
         }) ];

     

       188
       188
       +
         }) ./cfi_startproc-reorder-label-2.diff ];

     

       180
       189
        
       }.${majorVersion} or [])

     

       181
       190
        
       

     

       182
       191
        
       # Work around newer AvailabilityInternal.h when building older versions of GCC.