diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 2aef3007cbf9..90d49147a63a 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -69,6 +69,16 @@ let atLeast7 = lib.versionAtLeast version "7"; atLeast6 = lib.versionAtLeast version "6"; atLeast49 = lib.versionAtLeast version "4.9"; + is13 = majorVersion == "13"; + is12 = majorVersion == "12"; + is11 = majorVersion == "11"; + is10 = majorVersion == "10"; + is9 = majorVersion == "9"; + is8 = majorVersion == "8"; + is7 = majorVersion == "7"; + is6 = majorVersion == "6"; + is49 = majorVersion == "4" && lib.versions.minor version == "9"; + is48 = majorVersion == "4" && lib.versions.minor version == "8"; in # We enable the isl cloog backend. @@ -81,7 +91,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; -assert (atLeast6 && (!atLeast7 || atLeast9)) -> (langAda -> gnat-bootstrap != null); +assert (atLeast6 && !is7 && !is8) -> (langAda -> gnat-bootstrap != null); # TODO: fixup D bootstapping, probably by using gdc11 (and maybe other changes). # error: GDC is required to build d @@ -97,8 +107,7 @@ assert reproducibleBuild -> profiledCompiler == false; with lib; with builtins; -let majorVersion = lib.versions.major version; - inherit version; +let inherit version; disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler); inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -228,17 +237,17 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - src = if majorVersion == "6" && stdenv.targetPlatform.isVc4 then fetchFromGitHub { + src = if is6 && stdenv.targetPlatform.isVc4 then fetchFromGitHub { owner = "itszor"; repo = "gcc-vc4"; rev = "e90ff43f9671c760cf0d1dd62f569a0fb9bf8918"; sha256 = "0gxf66hwqk26h8f853sybphqa5ca0cva2kmrw5jsiv6139g0qnp8"; - } else if majorVersion == "6" && stdenv.targetPlatform.isRedox then fetchFromGitHub { + } else if is6 && stdenv.targetPlatform.isRedox then fetchFromGitHub { owner = "redox-os"; repo = "gcc"; rev = "f360ac095028d286fc6dde4d02daed48f59813fa"; # `redox` branch sha256 = "1an96h8l58pppyh3qqv90g8hgcfd9hj7igvh2gigmkxbrx94khfl"; - } else (fetchurl { + } else fetchurl { url = if atLeast7 then "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz" else if atLeast6 @@ -256,7 +265,7 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; "4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; }."${version}"; - }); + }; inherit patches; @@ -272,14 +281,14 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ libc_dev = stdenv.cc.libc_dev; hardeningDisable = [ "format" "pie" ] - ++ lib.optionals (atLeast11 && !atLeast12 && langAda) [ "fortify3" ]; + ++ lib.optionals (is11 && langAda) [ "fortify3" ]; - postPatch = (lib.optionalString atLeast7 '' + postPatch = lib.optionalString atLeast7 '' configureScripts=$(find . -name configure) for configureScript in $configureScripts; do patchShebangs $configureScript done - '') + '' # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. + lib.optionalString (atLeast6 && hostPlatform.isDarwin) '' @@ -339,8 +348,8 @@ ${""} done configurePlatforms = [ "build" "host" "target" ]; configureFlags = (callFile ./common/configure-flags.nix { }) - ++ optional (atLeast7 && !atLeast8 && targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" - ++ optional (atLeast7 && !atLeast8 && targetPlatform.isNetBSD) "--disable-libcilkrts"; + ++ optional (is7 && targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" + ++ optional (is7 && targetPlatform.isNetBSD) "--disable-libcilkrts"; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -405,7 +414,7 @@ ${""} done inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; } // lib.optionalAttrs (!atLeast12) { - hardeningUnsupportedFlags = lib.optionals (!atLeast49) [ "stackprotector" ] ++ [ "fortify3" ]; + hardeningUnsupportedFlags = lib.optionals is48 [ "stackprotector" ] ++ [ "fortify3" ]; }; enableParallelBuilding = true; @@ -421,23 +430,23 @@ ${""} done maintainers ; } // lib.optionalAttrs (!atLeast11) { - badPlatforms = if atLeast49 then [ "aarch64-darwin" ] else lib.platforms.darwin; + badPlatforms = if !is49 then [ "aarch64-darwin" ] else lib.platforms.darwin; }; -} // optionalAttrs (atLeast7 && !atLeast8) { +} // optionalAttrs is7 { env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; } // optionalAttrs (!atLeast7) { env.langJava = langJava; -} // optionalAttrs (atLeast6) { +} // optionalAttrs atLeast6 { NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; } // optionalAttrs (!atLeast8) { doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv -} // optionalAttrs (enableMultilib) { +} // optionalAttrs enableMultilib { dontMoveLib64 = true; -} // optionalAttrs (atLeast49 && !atLeast7 && langJava && (!atLeast6 || !stdenv.hostPlatform.isDarwin)) { - postFixup = '' - target="$(echo "$out/libexec/gcc"/*/*/ecj*)" - patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" - ''; +} // optionalAttrs (((is49 && !stdenv.hostPlatform.isDarwin) || is6) && langJava) { + postFixup = '' + target="$(echo "$out/libexec/gcc"/*/*/ecj*)" + patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" + ''; } )) ([ diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index d46046ed5713..1a9d7be539b2 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -34,18 +34,28 @@ let atLeast7 = lib.versionAtLeast version "7"; atLeast6 = lib.versionAtLeast version "6"; atLeast49 = lib.versionAtLeast version "4.9"; + is13 = majorVersion == "13"; + is12 = majorVersion == "12"; + is11 = majorVersion == "11"; + is10 = majorVersion == "10"; + is9 = majorVersion == "9"; + is8 = majorVersion == "8"; + is7 = majorVersion == "7"; + is6 = majorVersion == "6"; + is49 = majorVersion == "4" && lib.versions.minor version == "9"; + is48 = majorVersion == "4" && lib.versions.minor version == "8"; inherit (lib) optionals optional; in -optionals (atLeast49 && !atLeast7) [ +optionals (is49 || is6) [ ./9/fix-struct-redefinition-on-glibc-2.36.patch -] ++ optionals (atLeast49 && ((!atLeast7 && !stdenv.targetPlatform.isRedox) || !atLeast6)) [ +] ++ optionals (is49 || (is6 && !stdenv.targetPlatform.isRedox)) [ ./use-source-date-epoch.patch -] ++ optionals (atLeast6 && !atLeast7 && !stdenv.targetPlatform.isRedox) [ +] ++ optionals (is6 && !stdenv.targetPlatform.isRedox) [ ./6/0001-Fix-build-for-glibc-2.31.patch ] ++ optionals (!atLeast6) [ ./parallel-bconfig.patch -] ++ optionals (atLeast49 && !atLeast6) [ +] ++ optionals (is49) [ (./. + "/${lib.versions.major version}.${lib.versions.minor version}/parallel-strsignal.patch") (./. + "/${lib.versions.major version}.${lib.versions.minor version}/libsanitizer.patch") (fetchpatch { @@ -53,7 +63,7 @@ optionals (atLeast49 && !atLeast7) [ url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; sha256 = "0b32sb4psv5lq0ij9fwhi1b4pjbwdjnv24nqprsk14dsc6xmi1g0"; }) -] ++ optionals (atLeast7 && !atLeast8) [ +] ++ optionals (is7) [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html (./. + "/${majorVersion}/riscv-pthread-reentrant.patch") # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html @@ -61,28 +71,27 @@ optionals (atLeast49 && !atLeast7) [ # Fix for asan w/glibc-2.34. Although there's no upstream backport to v7, # the patch from gcc 8 seems to work perfectly fine. (./. + "/${majorVersion}/gcc8-asan-glibc-2.34.patch") -] ++ optionals (atLeast7 && !atLeast8) [ (./. + "/${majorVersion}/0001-Fix-build-for-glibc-2.31.patch") ] ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch ++ optional (atLeast6 && !atLeast12) ./fix-bug-80431.patch -++ optional (atLeast7 && !atLeast9) ./9/fix-struct-redefinition-on-glibc-2.36.patch -++ optional (atLeast10 && !atLeast11) ./11/fix-struct-redefinition-on-glibc-2.36.patch +++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch +++ optional (is10) ./11/fix-struct-redefinition-on-glibc-2.36.patch ++ optional (targetPlatform != hostPlatform) ./libstdc++-target.patch ++ optional (atLeast7 && !atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch -++ optional (noSysDirs && atLeast12) ./gcc-12-no-sys-dirs.patch -++ optional (noSysDirs && !atLeast12) ./no-sys-dirs.patch -++ optional (atLeast6 && !atLeast7 && langAda) ./gnat-cflags.patch -++ optional (atLeast6 && !atLeast7 && langAda) ./6/gnat-glibc234.patch -++ optional (noSysDirs && atLeast10 && (is10 || !atLeast12 -> hostPlatform.isRiscV)) ./no-sys-dirs-riscv.patch -++ optional (noSysDirs && atLeast9 && !atLeast10 && hostPlatform.isRiscV) ./no-sys-dirs-riscv-gcc9.patch +++ optional (noSysDirs) (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) +++ optionals (is6 && langAda) [ + ./gnat-cflags.patch + ./6/gnat-glibc234.patch +] ++ optional (noSysDirs && atLeast10 && (is10 || (!atLeast12 -> hostPlatform.isRiscV))) ./no-sys-dirs-riscv.patch +++ optional (noSysDirs && is9 && hostPlatform.isRiscV) ./no-sys-dirs-riscv-gcc9.patch ++ optionals (langAda || atLeast12) [ ./gnat-cflags-11.patch -] ++ optionals (langAda && atLeast9 && !atLeast11) [ +] ++ optionals (langAda && (is9 || is10)) [ ./gnat-cflags.patch ] ++ optionals atLeast12 [ ./gcc-12-gfortran-driving.patch ./ppc-musl.patch -] ++ optionals (majorVersion == "12") [ +] ++ optionals is12 [ # backport ICE fix on ccache code ./12/lambda-ICE-PR109241.patch ] @@ -101,27 +110,27 @@ optionals (atLeast49 && !atLeast7) [ }) ]; }."${majorVersion}" or []) ++ optional (atLeast9 && langD) ./libphobos.patch -++ optional (atLeast7 && !atLeast8 && hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied +++ optional (is7 && hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs"; }) -++ optional langFortran ../gfortran-driving.patch -++ optional (!atLeast49 && hostPlatform.isDarwin) ../gfortran-darwin-NXConstStr.patch -++ optionals (atLeast49 && !atLeast6) [ +++ optional (!atLeast12 && langFortran) ./gfortran-driving.patch +++ optional (!atLeast49 && hostPlatform.isDarwin) ./gfortran-darwin-NXConstStr.patch +++ optionals (is49) [ # glibc-2.26 ./struct-ucontext.patch ./struct-sigaltstack-4.9.patch ] # TODO: deduplicate this with copy above -- leaving duplicated for now in order to avoid changing eval results by reordering ++ optional (atLeast7 && !atLeast12 && targetPlatform.libc == "musl" && targetPlatform.isPower) ./ppc-musl.patch -++ optional (atLeast6 && !atLeast8 && targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { +++ optional ((is6 || is7) && targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; }) -++ optional (atLeast6 && atLeast7 && !atLeast9 && targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch -++ optional (atLeast6 && !atLeast7 && langGo) ./gogcc-workaround-glibc-2.36.patch +++ optional ((is6 || is7 || is8) && !atLeast9 && targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch +++ optional (is6 && langGo) ./gogcc-workaround-glibc-2.36.patch # TODO: deduplicate this with copy above -- leaving duplicated for now in order to avoid changing eval results by reordering -++ optionals (atLeast11 && !atLeast12 && stdenv.isDarwin) [ +++ optionals (is11 && stdenv.isDarwin) [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0 @@ -130,7 +139,7 @@ optionals (atLeast49 && !atLeast7) [ }) ] # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 -++ optional (atLeast11 && !atLeast12 && stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch +++ optional (is11 && stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # backport fixes to build gccgo with musl libc ++ optionals (atLeast12 && langGo && stdenv.hostPlatform.isMusl) [ @@ -181,23 +190,24 @@ optionals (atLeast49 && !atLeast7) [ ./Added-mcf-thread-model-support-from-mcfgthread.patch # Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits) -++ optionals (atLeast49 && !atLeast6) (builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;}) - [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; } - { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; } - { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; } - { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; } - { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; } - { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; } - { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; } - { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; } - { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; } - { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } - { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } - { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } - { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]) +++ optionals is49 + (builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;}) + [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; } + { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; } + { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; } + { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; } + { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; } + { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; } + { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; } + { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; } + { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; } + { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } + { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } + { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } + { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]) ++ optional (atLeast49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch -++ optional (atLeast49 && !atLeast6) [ +++ optional (is49 && !atLeast6) [ # gcc-11 compatibility (fetchpatch { name = "gcc4-char-reload.patch"; @@ -208,13 +218,13 @@ optionals (atLeast49 && !atLeast7) [ ] # openjdk build fails without this on -march=opteron; is upstream in gcc12 -++ optionals (majorVersion == "11") [ ./11/gcc-issue-103910.patch ] +++ optionals (is11) [ ./11/gcc-issue-103910.patch ] -++ optional (majorVersion == "10" && buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch { +++ optional (is10 && buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch { url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch"; sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA="; }) -++ lib.optionals (!atLeast49) [ +++ lib.optionals is48 [ (fetchpatch { name = "libc_name_p.diff"; # needed to build with gcc6 url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1";