Unverified Commit c6932c00 authored by Emily's avatar Emily Committed by GitHub
Browse files

gfortran48, gcc48, texinfo5: removal of the old version (#341100)

parents d6106f99 dd724813

pkgs/by-name/gf/gfortran48/package.nix

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
{ wrapCC, gcc48 }:

wrapCC (

  gcc48.cc.override {

    name = "gfortran";

    langFortran = true;

    langCC = false;

    langC = false;

    profiledCompiler = false;

  }

)

pkgs/development/compilers/gcc/all.nix

+2 −7
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
, libcCross

, threadsCross

, noSysDirs

, texinfo5

, cloog_0_18_0, cloog

, lowPrio

, wrapCC
@@ -30,15 +29,11 @@ let 
              else if    atLeast "9"   then isl_0_20

              else if    atLeast "7"   then isl_0_17

              else if    atLeast "6"   then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14)

              else if    atLeast "4.9" then isl_0_11

              else            /* "4.8" */   isl_0_14;

      } // lib.optionalAttrs (majorMinorVersion == "4.8") {

        texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump

              else            /* "4.9" */   isl_0_11;

      } // lib.optionalAttrs (!(atLeast "6")) {

        cloog = if stdenv.isDarwin

                then null

                else if atLeast "4.9" then cloog_0_18_0

                else          /* 4.8 */    cloog;

                else          /* 4.9 */    cloog_0_18_0;

      } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) {

        # gcc 10 is too strict to cross compile gcc <= 8

        stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;

pkgs/development/compilers/gcc/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ let 
  is7  = majorVersion == "7";

  is6  = majorVersion == "6";

  is49 = majorVersion == "4" && versions.minor version == "9";

  is48 = majorVersion == "4" && versions.minor version == "8";



    disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);
@@ -429,8 +428,8 @@ pipe ((callFile ./common/builder.nix {}) ({ 
  passthru = {

    inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version;

    isGNU = true;

    hardeningUnsupportedFlags = optional is48 "stackprotector"

      ++ optional (

    hardeningUnsupportedFlags =

      optional (

        (targetPlatform.isAarch64 && !atLeast9) || !atLeast8

      ) "stackclashprotection"

      ++ optional (!atLeast11) "zerocallusedregs"
@@ -461,7 +460,7 @@ pipe ((callFile ./common/builder.nix {}) ({ 
    badPlatforms =

      # avr-gcc8 is maintained for the `qmk` package

      if (is8 && targetPlatform.isAvr) then []

      else if !(is48 || is49 || is6) then [ "aarch64-darwin" ]

      else if !(is49 || is6) then [ "aarch64-darwin" ]

      else platforms.darwin;

  } // optionalAttrs is10 {

    badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ];

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

+0 −20
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ let 
  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
@@ -346,22 +345,3 @@ in 
## gcc 4.8 only ##############################################################################



++ optional (!atLeast49 && hostPlatform.isDarwin) ./gfortran-darwin-NXConstStr.patch
 
++ 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";

    sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl";

    excludes = [ "gcc/cp/ChangeLog" ];

  })

  # glibc-2.26

  ./struct-ucontext-4.8.patch

  ./sigsegv-not-declared.patch

  ./res_state-not-declared.patch

  # gcc-11 compatibility

  (fetchpatch {

    name = "gcc4-char-reload.patch";

    url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58";

    includes = [ "gcc/reload.h" ];

    sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM=";

  })

]

pkgs/development/compilers/gcc/patches/res_state-not-declared.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc

index fe69430..49f5270 100644

--- a/libsanitizer/tsan/tsan_platform_linux.cc

+++ b/libsanitizer/tsan/tsan_platform_linux.cc

@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {

 // closes within glibc. The code is a pure hack.

 int ExtractResolvFDs(void *state, int *fds, int nfd) {

   int cnt = 0;

-  __res_state *statp = (__res_state*)state;

+  struct __res_state *statp = (struct __res_state*)state;

   for (int i = 0; i < MAXNS && cnt < nfd; i++) {

     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)

       fds[cnt++] = statp->_u._ext.nssocks[i];