diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-12-24 23:27:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-24 23:27:23 +0100 |
| commit | 47a9d0354144b253cb9089317622e0cb25f9b4a0 (patch) | |
| tree | e659dce8a949eea98f13e0330931206e7f7e3276 /pkgs | |
| parent | 3a2478605d66b73f598f3b1b930e87fa87785113 (diff) | |
| download | nixlib-47a9d0354144b253cb9089317622e0cb25f9b4a0.tar nixlib-47a9d0354144b253cb9089317622e0cb25f9b4a0.tar.gz nixlib-47a9d0354144b253cb9089317622e0cb25f9b4a0.tar.bz2 nixlib-47a9d0354144b253cb9089317622e0cb25f9b4a0.tar.lz nixlib-47a9d0354144b253cb9089317622e0cb25f9b4a0.tar.xz nixlib-47a9d0354144b253cb9089317622e0cb25f9b4a0.tar.zst nixlib-47a9d0354144b253cb9089317622e0cb25f9b4a0.zip | |
gcc: maintenance update 4.8.3 -> 4.8.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/bug-61801.patch | 15 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 6 |
2 files changed, 3 insertions, 18 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/bug-61801.patch b/pkgs/development/compilers/gcc/4.8/bug-61801.patch deleted file mode 100644 index 3d87e007813b..000000000000 --- a/pkgs/development/compilers/gcc/4.8/bug-61801.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61801 -https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=212740 - ---- a/gcc/sched-deps.c 2014/07/17 07:48:49 212739 -+++ b/gcc/sched-deps.c 2014/07/17 07:49:44 212740 -@@ -2744,7 +2744,8 @@ - Consider for instance a volatile asm that changes the fpu rounding - mode. An insn should not be moved across this even if it only uses - pseudo-regs because it might give an incorrectly rounded result. */ -- if (code != ASM_OPERANDS || MEM_VOLATILE_P (x)) -+ if ((code != ASM_OPERANDS || MEM_VOLATILE_P (x)) -+ && !DEBUG_INSN_P (insn)) - reg_pending_barrier = TRUE_BARRIER; - - /* For all ASM_OPERANDS, we must traverse the vector of input operands. diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 6547d9b12b6c..1b5638492316 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -54,14 +54,14 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.8.3"; +let version = "4.8.4"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; enableParallelBuilding = true; - patches = [ ./bug-61801.patch ] + patches = [ ] ++ optional enableParallelBuilding ./parallel-bconfig.patch ++ optional (cross != null) ./libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka"; + sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a"; }; inherit patches; |