summary refs log tree commit diff
path: root/pkgs/development/tools/misc/gdb
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-11-24 14:42:49 +0000
committerSergei Trofimovich <slyich@gmail.com>2021-11-26 17:57:18 +0000
commit53e928ed5f1c2c07b17d0bf18179754ecd920e49 (patch)
tree4da1cdc582a2a71c516d14191cc0334eb41435d2 /pkgs/development/tools/misc/gdb
parent02cea625b00fec97ffc5da1a3e992db05b624696 (diff)
downloadnixpkgs-53e928ed5f1c2c07b17d0bf18179754ecd920e49.tar
nixpkgs-53e928ed5f1c2c07b17d0bf18179754ecd920e49.tar.gz
nixpkgs-53e928ed5f1c2c07b17d0bf18179754ecd920e49.tar.bz2
nixpkgs-53e928ed5f1c2c07b17d0bf18179754ecd920e49.tar.lz
nixpkgs-53e928ed5f1c2c07b17d0bf18179754ecd920e49.tar.xz
nixpkgs-53e928ed5f1c2c07b17d0bf18179754ecd920e49.tar.zst
nixpkgs-53e928ed5f1c2c07b17d0bf18179754ecd920e49.zip
gdb: pull upstream fix for gcc-12
Without the change the build fails as:

    sim/cr16/interp.c: In function 'lookup_hash':
    sim/cr16/interp.c:89:25: error:
      the comparison will always evaluate as 'true'
      for the address of 'mnimonic' will never be NULL [-Werror=address]
       89 |   if ((h->ops->mnimonic != NULL) &&
          |                         ^~
Diffstat (limited to 'pkgs/development/tools/misc/gdb')
-rw-r--r--pkgs/development/tools/misc/gdb/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 62290548ec7..c173b96f6eb 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, targetPackages
 
 # Build time
-, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
+, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
 
 # Run time
 , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight
@@ -41,6 +41,13 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./debug-info-from-env.patch
+
+    # Pull upstream fix for gcc-12. Will be included in gdb-12.
+    (fetchpatch {
+      name = "gcc-12.patch";
+      url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=e97436b1b789dcdb6ffb502263f4c86f8bc22996";
+      sha256 = "1mpgw6s9qgnwhwyg3hagc6vhqhvia0l1s8nr22bcahwqxi3wvzcw";
+    })
   ] ++ lib.optionals stdenv.isDarwin [
     ./darwin-target-match.patch
   ];