diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-02-13 13:34:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-02-13 13:36:01 +0100 |
| commit | a6767ed93421c5afde3fb086bb8e89759112aa74 (patch) | |
| tree | 3647a1c171407cd489723fde588c1cbeede165c7 /pkgs/development/compilers/gcc/11 | |
| parent | fd8daee7c2ac1f019563923e2b61431644301083 (diff) | |
| parent | b83f032ffcbc6b1b9f412d50b7a6ba3cfe471d0a (diff) | |
| download | nixpkgs-a6767ed93421c5afde3fb086bb8e89759112aa74.tar nixpkgs-a6767ed93421c5afde3fb086bb8e89759112aa74.tar.gz nixpkgs-a6767ed93421c5afde3fb086bb8e89759112aa74.tar.bz2 nixpkgs-a6767ed93421c5afde3fb086bb8e89759112aa74.tar.lz nixpkgs-a6767ed93421c5afde3fb086bb8e89759112aa74.tar.xz nixpkgs-a6767ed93421c5afde3fb086bb8e89759112aa74.tar.zst nixpkgs-a6767ed93421c5afde3fb086bb8e89759112aa74.zip | |
Merge #212363: gcc11: apply upstream patch
...into staging-next https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103910
Diffstat (limited to 'pkgs/development/compilers/gcc/11')
| -rw-r--r-- | pkgs/development/compilers/gcc/11/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/11/gcc-issue-103910.patch | 41 |
2 files changed, 45 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 8c11c171112..1c6b7326c07 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -82,7 +82,10 @@ let majorVersion = "11"; ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + + # openjdk build fails without this on -march=opteron; is upstream in gcc12 + ++ [ ./gcc-issue-103910.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch b/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch new file mode 100644 index 00000000000..c3edd960f09 --- /dev/null +++ b/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch @@ -0,0 +1,41 @@ +From d243f4009d8071b734df16cd70f4c5d09a373769 Mon Sep 17 00:00:00 2001 +From: Andrew Pinski <apinski@marvell.com> +Date: Wed, 5 Jan 2022 22:00:07 +0000 +Subject: [PATCH] Fix target/103910: missing GTY on x86_mfence causing PCH + usage to ICE + +With -O3 -march=opteron, a mfence builtin is added after the loop +to say the nontemporal stores are no longer needed. This all good +without precompiled headers as the function decl that is referneced +by x86_mfence is referenced in another variable but with precompiled +headers, x86_mfence is all messed up and the decl was GC'ed away. +This fixes the problem by marking x86_mfence as GTY to save/restore +during precompiled headers just like most other variables in +the header file. + +Committed as obvious after a bootstrap/test on x86_64-linux-gnu. + +gcc/ChangeLog: + + PR target/103910 + * config/i386/i386.h (x86_mfence): Mark with GTY. +--- + gcc/config/i386/i386.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h +index f027608eefa..3ac0f698ae2 100644 +--- a/gcc/config/i386/i386.h ++++ b/gcc/config/i386/i386.h +@@ -486,7 +486,7 @@ extern unsigned char ix86_prefetch_sse; + + /* Fence to use after loop using storent. */ + +-extern tree x86_mfence; ++extern GTY(()) tree x86_mfence; + #define FENCE_FOLLOWING_MOVNT x86_mfence + + /* Once GDB has been enhanced to deal with functions without frame +-- +2.31.1 + |