commit 8f85dcb0afbf30a6ab6ac796b8ef6f474a9a66ba · pyrox.dev/nixpkgs

-41

pkgs/development/compilers/gcc/patches/11/gcc-issue-103910.patch

···

       1
       1
       -
       From d243f4009d8071b734df16cd70f4c5d09a373769 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Andrew Pinski <apinski@marvell.com>

     

       3
       3
       -
       Date: Wed, 5 Jan 2022 22:00:07 +0000

     

       4
       4
       -
       Subject: [PATCH] Fix target/103910: missing GTY on x86_mfence causing PCH

     

       5
       5
       -
        usage to ICE

     

       6
       6
       -
       

     

       7
       7
       -
       With -O3 -march=opteron, a mfence builtin is added after the loop

     

       8
       8
       -
       to say the nontemporal stores are no longer needed. This all good

     

       9
       9
       -
       without precompiled headers as the function decl that is referneced

     

       10
       10
       -
       by x86_mfence is referenced in another variable but with precompiled

     

       11
       11
       -
       headers, x86_mfence is all messed up and the decl was GC'ed away.

     

       12
       12
       -
       This fixes the problem by marking x86_mfence as GTY to save/restore

     

       13
       13
       -
       during precompiled headers just like most other variables in

     

       14
       14
       -
       the header file.

     

       15
       15
       -
       

     

       16
       16
       -
       Committed as obvious after a bootstrap/test on x86_64-linux-gnu.

     

       17
       17
       -
       

     

       18
       18
       -
       gcc/ChangeLog:

     

       19
       19
       -
       

     

       20
       20
       -
       	PR target/103910

     

       21
       21
       -
       	* config/i386/i386.h (x86_mfence): Mark with GTY.

     

       22
       22
       -
       ---

     

       23
       23
       -
        gcc/config/i386/i386.h | 2 +-

     

       24
       24
       -
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       25
       25
       -
       

     

       26
       26
       -
       diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h

     

       27
       27
       -
       index f027608eefa..3ac0f698ae2 100644

     

       28
       28
       -
       --- a/gcc/config/i386/i386.h

     

       29
       29
       -
       +++ b/gcc/config/i386/i386.h

     

       30
       30
       -
       @@ -486,7 +486,7 @@ extern unsigned char ix86_prefetch_sse;

     

       31
       31
       -
        

     

       32
       32
       -
        /* Fence to use after loop using storent.  */

     

       33
       33
       -
        

     

       34
       34
       -
       -extern tree x86_mfence;

     

       35
       35
       -
       +extern GTY(()) tree x86_mfence;

     

       36
       36
       -
        #define FENCE_FOLLOWING_MOVNT x86_mfence

     

       37
       37
       -
        

     

       38
       38
       -
        /* Once GDB has been enhanced to deal with functions without frame

     

       39
       39
       -
       -- 

     

       40
       40
       -
       2.31.1

     

       41
       41
       -

+71 -5

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

···

       63
       63
        
       ## 1. Patches relevant to gcc>=12 on every platform ####################################

     

       64
       64
        
       

     

       65
       65
        
       [ ]

     

       66
       66
       -
       ++ optional (!atLeast12) ./fix-bug-80431.patch

     

       66
       66
       +
       # Backport "c++: conversion to base of vbase in NSDMI"

     

       67
       67
       +
       # Fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431

     

       68
       68
       +
       ++ optional (!atLeast12) (fetchpatch {

     

       69
       69
       +
         name = "gcc-bug80431-fix";

     

       70
       70
       +
         url = "https://github.com/gcc-mirror/gcc/commit/de31f5445b12fd9ab9969dc536d821fe6f0edad0.patch";

     

       71
       71
       +
         hash = "sha256-bnHKJP5jR8rNJjRTi58/N/qZ5fPkuFBk7WblJWQpKOs=";

     

       72
       72
       +
       })

     

       73
       73
       +
       # Pass the path to a C++ compiler directly in the Makefile.in

     

       67
       74
        
       ++ optional (!lib.systems.equals targetPlatform hostPlatform) ./libstdc++-target.patch

     

       68
       75
        
       ++ optionals (noSysDirs) (

     

       69
       69
       -
         [ (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) ]

     

       76
       76
       +
         [

     

       77
       77
       +
           # Do not try looking for binaries and libraries in /lib and /usr/lib

     

       78
       78
       +
           (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)

     

       79
       79
       +
         ]

     

       70
       80
        
         ++ (

     

       71
       81
        
           {

     

       72
       82
        
             "15" = [

     

       83
       83
       +
               # Do not try looking for binaries and libraries in /lib and /usr/lib

     

       73
       84
        
               ./13/no-sys-dirs-riscv.patch

     

       85
       85
       +
               # Mangle the nix store hash in __FILE__ to prevent unneeded runtime references

     

       74
       86
        
               ./13/mangle-NIX_STORE-in-__FILE__.patch

     

       75
       87
        
             ];

     

       76
       88
        
             "14" = [

     
···

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

     

       93
       105
        
         )

     

       94
       106
        
       )

     

       107
       107
       +
       # Pass CFLAGS on to gnat

     

       95
       108
        
       ++ optional (atLeast12 && langAda) ./gnat-cflags-11.patch

     

       96
       109
        
       ++ optional langFortran (

     

       110
       110
       +
         # Fix interaction of gfortran and libtool

     

       111
       111
       +
         # Fixes the output of -v

     

       112
       112
       +
         # See also https://github.com/nixOS/nixpkgs/commit/cc6f814a8f0e9b70ede5b24192558664fa1f98a2

     

       97
       113
        
         if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch

     

       98
       114
        
       )

     

       115
       115
       +
       # Do not pass a default include dir on PowerPC+Musl

     

       116
       116
       +
       # See https://github.com/NixOS/nixpkgs/pull/45340/commits/d6bb7d45162ac93e017cc9b665ae4836f6410710

     

       99
       117
        
       ++ [ ./ppc-musl.patch ]

     

       118
       118
       +
       # Patches for libphobos, the standard library of the D language

     

       119
       119
       +
       # - Forces libphobos to be built with -j1, as libtool misbehaves in parallel

     

       120
       120
       +
       # - Gets rid of -idirafter flags added by our gcc wrappers, as gdc does not understand them

     

       121
       121
       +
       # See https://github.com/NixOS/nixpkgs/pull/69144#issuecomment-535176453

     

       100
       122
        
       ++ optional langD ./libphobos.patch

     

       123
       123
       +
       # Moves the .cfi_starproc instruction to after the function label

     

       124
       124
       +
       # Needed to build llvm-18 and later

     

       125
       125
       +
       # See https://github.com/NixOS/nixpkgs/pull/354107/commits/2de1b4b14e17f42ba8b4bf43a29347c91511e008

     

       101
       126
        
       ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff

     

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

     

       103
       128
        
       

     
···

       107
       132
        
       

     

       108
       133
        
       # backport fixes to build gccgo with musl libc

     

       109
       134
        
       ++ optionals (stdenv.hostPlatform.isMusl && langGo && atLeast12) [

     

       135
       135
       +
         # libgo: handle stat st_atim32 field and SYS_SECCOMP

     

       136
       136
       +
         # syscall: gofmt

     

       137
       137
       +
         # Add blank lines after //sys comments where needed, and then run gofmt

     

       138
       138
       +
         # on the syscall package with the new formatter.

     

       139
       139
       +
         # See https://go-review.googlesource.com/c/gofrontend/+/412074

     

       110
       140
        
         (fetchpatch {

     

       111
       141
        
           excludes = [ "gcc/go/gofrontend/MERGE" ];

     

       112
       142
        
           url = "https://github.com/gcc-mirror/gcc/commit/cf79b1117bd177d3d4c6ed24b6fa243c3628ac2d.diff";

     

       113
       143
        
           hash = "sha256-mS5ZiYi5D8CpGXrWg3tXlbhp4o86ew1imCTwaHLfl+I=";

     

       114
       144
        
         })

     

       145
       145
       +
         # libgo: permit loff_t and off_t to be macros

     

       146
       146
       +
         # See https://go-review.googlesource.com/c/gofrontend/+/412075

     

       115
       147
        
         (fetchpatch {

     

       116
       148
        
           excludes = [ "gcc/go/gofrontend/MERGE" ];

     

       117
       149
        
           url = "https://github.com/gcc-mirror/gcc/commit/7f195a2270910a6ed08bd76e3a16b0a6503f9faf.diff";

     

       118
       150
        
           hash = "sha256-Ze/cFM0dQofKH00PWPDoklXUlwWhwA1nyTuiDAZ6FKo=";

     

       119
       151
        
         })

     

       152
       152
       +
         # libgo: handle stat st_atim32 field and SYS_SECCOMP

     

       153
       153
       +
         # See https://go-review.googlesource.com/c/gofrontend/+/415294

     

       120
       154
        
         (fetchpatch {

     

       121
       155
        
           excludes = [ "gcc/go/gofrontend/MERGE" ];

     

       122
       156
        
           url = "https://github.com/gcc-mirror/gcc/commit/762fd5e5547e464e25b4bee435db6df4eda0de90.diff";

     

       123
       157
        
           hash = "sha256-o28upwTcHAnHG2Iq0OewzwSBEhHs+XpBGdIfZdT81pk=";

     

       124
       158
        
         })

     

       159
       159
       +
         # runtime: portable access to sigev_notify_thread_id

     

       160
       160
       +
         # See https://sourceware.org/bugzilla/show_bug.cgi?id=27417

     

       161
       161
       +
         # See https://go-review.googlesource.com/c/gofrontend/+/434755

     

       125
       162
        
         (fetchpatch {

     

       126
       163
        
           excludes = [ "gcc/go/gofrontend/MERGE" ];

     

       127
       164
        
           url = "https://github.com/gcc-mirror/gcc/commit/e73d9fcafbd07bc3714fbaf8a82db71d50015c92.diff";

     

       128
       165
        
           hash = "sha256-1SjYCVHLEUihdON2TOC3Z2ufM+jf2vH0LvYtZL+c1Fo=";

     

       129
       166
        
         })

     

       167
       167
       +
         # syscall, runtime: always call XSI strerror_r

     

       168
       168
       +
         # See https://go-review.googlesource.com/c/gofrontend/+/454176

     

       130
       169
        
         (fetchpatch {

     

       131
       170
        
           excludes = [ "gcc/go/gofrontend/MERGE" ];

     

       132
       171
        
           url = "https://github.com/gcc-mirror/gcc/commit/b6c6a3d64f2e4e9347733290aca3c75898c44b2e.diff";

     

       133
       172
        
           hash = "sha256-RycJ3YCHd3MXtYFjxP0zY2Wuw7/C4bWoBAQtTKJZPOQ=";

     

       134
       173
        
         })

     

       174
       174
       +
         # libgo: check for makecontext in -lucontext

     

       175
       175
       +
         # See https://go-review.googlesource.com/c/gofrontend/+/458396

     

       135
       176
        
         (fetchpatch {

     

       136
       177
        
           excludes = [ "gcc/go/gofrontend/MERGE" ];

     

       137
       178
        
           url = "https://github.com/gcc-mirror/gcc/commit/2b1a604a9b28fbf4f382060bebd04adb83acc2f9.diff";

     

       138
       179
        
           hash = "sha256-WiBQG0Xbk75rHk+AMDvsbrm+dc7lDH0EONJXSdEeMGE=";

     

       139
       180
        
         })

     

       181
       181
       +
         # x86: Fix -fsplit-stack feature detection via  TARGET_CAN_SPLIT_STACK

     

       182
       182
       +
         # Fixes compiling for non-glibc target

     

       140
       183
        
         (fetchpatch {

     

       141
       184
        
           url = "https://github.com/gcc-mirror/gcc/commit/c86b726c048eddc1be320c0bf64a897658bee13d.diff";

     

       142
       185
        
           hash = "sha256-QSIlqDB6JRQhbj/c3ejlmbfWz9l9FurdSWxpwDebnlI=";

     
···

       174
       217
        
         .${majorVersion} or [ ]

     

       175
       218
        
       )

     

       176
       219
        
       

     

       220
       220
       +
       # Here we apply patches by Iains (https://github.com/iains)

     

       221
       221
       +
       # GitHub's "compare" API produces unstable diffs, so we resort to reusing

     

       222
       222
       +
       # diffs from the Homebrew repo.

     

       177
       223
        
       ++ optionals canApplyIainsDarwinPatches (

     

       178
       224
        
         {

     

       179
       225
        
           "15" = [

     

       226
       226
       +
             # Patches from https://github.com/iains/gcc-15-branch/compare/releases/gcc-15..gcc-15.1-darwin-rc1

     

       180
       227
        
             (fetchpatch {

     

       181
       228
        
               name = "gcc-15-darwin-aarch64-support.patch";

     

       182
       229
        
               url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a25079204c1cb3d78ba9dd7dd22b8aecce7ce264/gcc/gcc-15.1.0.diff";

     
···

       184
       231
        
             })

     

       185
       232
        
           ];

     

       186
       233
        
           "14" = [

     

       234
       234
       +
             # Patches from https://github.com/iains/gcc-14-branch/compare/04696df09633baf97cdbbdd6e9929b9d472161d3..gcc-14.2-darwin-r2

     

       187
       235
        
             (fetchpatch {

     

       188
       236
        
               # There are no upstream release tags nor a static branch for 14.3.0 in https://github.com/iains/gcc-14-branch.

     

       189
       237
        
               # aa4cd614456de65ee3417acb83c6cff0640144e9 is the merge base of https://github.com/iains/gcc-14-branch/tree/gcc-14-3-darwin-pre-0 and https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.3.0

     
···

       193
       241
        
               hash = "sha256-BSTSYnkBJBEm++mGerVVyaCUC4dUyXq0N1tqbk25bO4=";

     

       194
       242
        
             })

     

       195
       243
        
           ];

     

       244
       244
       +
           # Patches from https://github.com/iains/gcc-13-branch/compare/b71f1de6e9cf7181a288c0f39f9b1ef6580cf5c8..gcc-13-3-darwin

     

       196
       245
        
           "13" = [

     

       197
       246
        
             (fetchpatch {

     

       198
       247
        
               name = "gcc-13-darwin-aarch64-support.patch";

     

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

     

       200
       249
        
               sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo=";

     

       201
       250
        
             })

     

       251
       251
       +
             # Needed to build LLVM>18

     

       202
       252
        
             ./cfi_startproc-reorder-label-2.diff

     

       203
       253
        
           ];

     

       254
       254
       +
           # Patches from https://github.com/iains/gcc-12-branch/compare/2bada4bc59bed4be34fab463bdb3c3ebfd2b41bb..gcc-12-4-darwin

     

       204
       255
        
           "12" = [

     

       205
       256
        
             (fetchurl {

     

       206
       257
        
               name = "gcc-12-darwin-aarch64-support.patch";

     

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

     

       208
       259
        
               sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw=";

     

       209
       260
        
             })

     

       261
       261
       +
             # Needed to build LLVM>18

     

       210
       262
        
             ./cfi_startproc-reorder-label-2.diff

     

       211
       263
        
           ];

     

       212
       264
        
           "11" = [

     
···

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

     

       217
       269
        
               hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE=";

     

       218
       270
        
             })

     

       271
       271
       +
             # Needed to build LLVM>18

     

       219
       272
        
             ./cfi_startproc-reorder-label-2.diff

     

       220
       273
        
           ];

     

       221
       274
        
           "10" = [

     
···

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

     

       226
       279
        
               hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk=";

     

       227
       280
        
             })

     

       281
       281
       +
             # Needed to build LLVM>18

     

       228
       282
        
             ./cfi_startproc-reorder-label-2.diff

     

       229
       283
        
           ];

     

       230
       284
        
         }

     
···

       241
       295
        
       

     

       242
       296
        
       ## Windows

     

       243
       297
        
       

     

       244
       244
       -
       # Obtain latest patch with ../update-mcfgthread-patches.sh

     

       298
       298
       +
       # Backported mcf thread model support from gcc13:

     

       299
       299
       +
       # https://github.com/gcc-mirror/gcc/commit/f036d759ecee538555fa8c6b11963e4033732463

     

       245
       300
        
       ++ optional (

     

       246
       301
        
         !atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf"

     

       247
       302
        
       ) (./. + "/${majorVersion}/Added-mcf-thread-model-support-from-mcfgthread.patch")

     
···

       259
       314
        
       ## gcc 11.0 and older ##############################################################################

     

       260
       315
        
       

     

       261
       316
        
       # openjdk build fails without this on -march=opteron; is upstream in gcc12

     

       262
       262
       -
       ++ optionals (is11) [ ./11/gcc-issue-103910.patch ]

     

       317
       317
       +
       ++ optional is11 (fetchpatch {

     

       318
       318
       +
         name = "darwin-aarch64-self-host-driver.patch";

     

       319
       319
       +
         url = "https://github.com/gcc-mirror/gcc/commit/d243f4009d8071b734df16cd70f4c5d09a373769.patch";

     

       320
       320
       +
         sha256 = "sha256-H97GZs2wwzfFGiFOgds/5KaweC+luCsWX3hRFf7+Sm4=";

     

       321
       321
       +
       })

     

       263
       322
        
       

     

       264
       323
        
       ## gcc 10.0 and older ##############################################################################

     

       265
       324
        
       

     

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

     

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

     

       267
       327
        
       ++

     

       328
       328
       +
         # Backport native aarch64-darwin compilation fix from gcc12

     

       329
       329
       +
         # https://github.com/NixOS/nixpkgs/pull/167595

     

       268
       330
        
         optional

     

       269
       331
        
           (

     

       270
       332
        
             is10

     
···

       272
       334
        
             && (!lib.systems.equals targetPlatform buildPlatform)

     

       273
       335
        
           )

     

       274
       336
        
           (fetchpatch {

     

       275
       275
       -
             url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch";

     

       337
       337
       +
             name = "0008-darwin-aarch64-self-host-driver.patch";

     

       338
       338
       +
             url = "https://github.com/gcc-mirror/gcc/commit/834c8749ced550af3f17ebae4072fb7dfb90d271.diff";

     

       276
       339
        
             sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA=";

     

       277
       340
        
           })

     

       278
       341
        
       

     
···

       284
       347
        
       ## gcc 9.0 and older ##############################################################################

     

       285
       348
        
       

     

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

     

       350
       350
       +
       # Needed for NetBSD cross comp in older versions

     

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

     

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

     

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

     

       288
       354
        
       

     

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

-92

pkgs/development/compilers/gcc/patches/fix-bug-80431.patch

···

       1
       1
       -
       From de31f5445b12fd9ab9969dc536d821fe6f0edad0 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Patrick Palka <ppalka@redhat.com>

     

       3
       3
       -
       Date: Mon, 21 Jun 2021 07:54:26 -0400

     

       4
       4
       -
       Subject: [PATCH] c++: conversion to base of vbase in NSDMI [PR80431]

     

       5
       5
       -
       

     

       6
       6
       -
       The delayed processing of conversions to a virtual base in an NSDMI

     

       7
       7
       -
       assumes the target base type is a (possibly indirect) virtual base of

     

       8
       8
       -
       the current class, but the target base type could also be a base of a

     

       9
       9
       -
       virtual base, as in the testcase below.  Since such a base isn't a part

     

       10
       10
       -
       of CLASSTYPE_VBASECLASSES, we end up miscompiling the testcase due to

     

       11
       11
       -
       the call to build_base_path (with binfo=NULL_TREE) silently returning

     

       12
       12
       -
       error_mark_node.  Fix this by using convert_to_base to build the

     

       13
       13
       -
       conversion instead.

     

       14
       14
       -
       

     

       15
       15
       -
       	PR c++/80431

     

       16
       16
       -
       

     

       17
       17
       -
       gcc/cp/ChangeLog:

     

       18
       18
       -
       

     

       19
       19
       -
       	* tree.c (bot_replace): Use convert_to_base to build the

     

       20
       20
       -
       	conversion to the (morally) virtual base.

     

       21
       21
       -
       

     

       22
       22
       -
       gcc/testsuite/ChangeLog:

     

       23
       23
       -
       

     

       24
       24
       -
       	* g++.dg/cpp0x/nsdmi-virtual1a.C: New test.

     

       25
       25
       -
       ---

     

       26
       26
       -
        gcc/cp/tree.c                                | 14 ++++------

     

       27
       27
       -
        gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C | 28 ++++++++++++++++++++

     

       28
       28
       -
        2 files changed, 33 insertions(+), 9 deletions(-)

     

       29
       29
       -
        create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C

     

       30
       30
       -
       

     

       31
       31
       -
       diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c

     

       32
       32
       -
       index fec5afaa2be..297da2b1550 100644

     

       33
       33
       -
       --- a/gcc/cp/tree.c

     

       34
       34
       -
       +++ b/gcc/cp/tree.c

     

       35
       35
       -
       @@ -3242,15 +3242,11 @@ bot_replace (tree* t, int* /*walk_subtrees*/, void* data_)

     

       36
       36
       -
          else if (TREE_CODE (*t) == CONVERT_EXPR

     

       37
       37
       -
        	   && CONVERT_EXPR_VBASE_PATH (*t))

     

       38
       38
       -
            {

     

       39
       39
       -
       -      /* In an NSDMI build_base_path defers building conversions to virtual

     

       40
       40
       -
       -	 bases, and we handle it here.  */

     

       41
       41
       -
       -      tree basetype = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (*t)));

     

       42
       42
       -
       -      vec<tree, va_gc> *vbases = CLASSTYPE_VBASECLASSES (current_class_type);

     

       43
       43
       -
       -      int i; tree binfo;

     

       44
       44
       -
       -      FOR_EACH_VEC_SAFE_ELT (vbases, i, binfo)

     

       45
       45
       -
       -	if (BINFO_TYPE (binfo) == basetype)

     

       46
       46
       -
       -	  break;

     

       47
       47
       -
       -      *t = build_base_path (PLUS_EXPR, TREE_OPERAND (*t, 0), binfo, true,

     

       48
       48
       -
       +      /* In an NSDMI build_base_path defers building conversions to morally

     

       49
       49
       -
       +	 virtual bases, and we handle it here.  */

     

       50
       50
       -
       +      tree basetype = TREE_TYPE (*t);

     

       51
       51
       -
       +      *t = convert_to_base (TREE_OPERAND (*t, 0), basetype,

     

       52
       52
       -
       +			    /*check_access=*/false, /*nonnull=*/true,

     

       53
       53
       -
        			    tf_warning_or_error);

     

       54
       54
       -
            }

     

       55
       55
       -
        

     

       56
       56
       -
       diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C

     

       57
       57
       -
       new file mode 100644

     

       58
       58
       -
       index 00000000000..dc847cc16e5

     

       59
       59
       -
       --- /dev/null

     

       60
       60
       -
       +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C

     

       61
       61
       -
       @@ -0,0 +1,28 @@

     

       62
       62
       -
       +// PR c++/80431

     

       63
       63
       -
       +// { dg-do run { target c++11 } }

     

       64
       64
       -
       +

     

       65
       65
       -
       +// A variant of nsdmi-virtual1.C where A is only a morally virtual base of B.

     

       66
       66
       -
       +

     

       67
       67
       -
       +struct A

     

       68
       68
       -
       +{

     

       69
       69
       -
       +  A(): i(42) { }

     

       70
       70
       -
       +  int i;

     

       71
       71
       -
       +  int f() { return i; }

     

       72
       72
       -
       +};

     

       73
       73
       -
       +

     

       74
       74
       -
       +struct D : A { int pad; };

     

       75
       75
       -
       +

     

       76
       76
       -
       +struct B : virtual D

     

       77
       77
       -
       +{

     

       78
       78
       -
       +  int j = i + f();

     

       79
       79
       -
       +  int k = A::i + A::f();

     

       80
       80
       -
       +};

     

       81
       81
       -
       +

     

       82
       82
       -
       +struct C: B { int pad; };

     

       83
       83
       -
       +

     

       84
       84
       -
       +int main()

     

       85
       85
       -
       +{

     

       86
       86
       -
       +  C c;

     

       87
       87
       -
       +  if (c.j != 84 || c.k != 84)

     

       88
       88
       -
       +    __builtin_abort();

     

       89
       89
       -
       +}

     

       90
       90
       -
       -- 

     

       91
       91
       -
       2.31.1

     

       92
       92
       -

-15

pkgs/development/compilers/gcc/patches/update-mcfgthread-patches.sh

···

       1
       1
       -
       #!/usr/bin/env nix-shell

     

       2
       2
       -
       #! nix-shell -i bash -p curl

     

       3
       3
       -
       

     

       4
       4
       -
       # We use this script to download local copies instead of using

     

       5
       5
       -
       # fetchpatch because lmhouse/MINGW-packages-dev is constantly rebased

     

       6
       6
       -
       # against msys2/MINGW-packages-dev and won't have stable commit hashes.

     

       7
       7
       -
       

     

       8
       8
       -
       name=Added-mcf-thread-model-support-from-mcfgthread.patch

     

       9
       9
       -
       source=https://raw.githubusercontent.com/lhmouse/MINGW-packages-dev/master/mingw-w64-gcc-git

     

       10
       10
       -
       dest=$(dirname "$0")

     

       11
       11
       -
       

     

       12
       12
       -
       for majorVersion in 6 7 8 9 10; do

     

       13
       13
       -
           curl "$source/9000-gcc-$majorVersion-branch-$name" \

     

       14
       14
       -
                > "$dest/$majorVersion/$name"

     

       15
       15
       -
       done