gcc-4.6: bump to 4.6.4

The dropped patch was applied upstream within the update.

3 files changed, 9 insertions, 227 deletions

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 0f08a908bfd4..feca5137f6d3 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -46,15 +46,12 @@ assert stdenv.isDarwin -> gnused != null;
 with stdenv.lib;
 with builtins;
 
-let version = "4.6.3";
+let version = "4.6.4";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    patches =
-      [ # Fix building on Glibc 2.16.
-        ./siginfo_t_fix.patch
-      ]
+    patches = [ ]
       ++ optional (cross != null) ./libstdc++-target.patch
       ++ optional noSysDirs ./no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
diff --git a/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch b/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch
deleted file mode 100644
index 1409c552c7d0..000000000000
--- a/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Partly taken from:
-http://gcc.gnu.org/git/?p=gcc.git;a=patch;h=5617a3db5d04630d0bfb71a3578894b4442f266d
-
-Adapted to gcc 4.6.3. Original commit text follows.
-
-From 5617a3db5d04630d0bfb71a3578894b4442f266d Mon Sep 17 00:00:00 2001
-From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 20 Apr 2012 07:44:50 +0000
-Subject: [PATCH] 	struct siginfo vs. siginfo_t
-
-gcc/
-	* config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use
-	siginfo_t instead of struct siginfo.
-	* config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise.
-	* config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise.
-	* config/ia64/linux-unwind.h (ia64_fallback_frame_state)
-	(ia64_handle_unwabi): Likewise.
-	* config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise.
-	* config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise.
-	* config/sh/linux-unwind.h (shmedia_fallback_frame_state)
-	(sh_fallback_frame_state): Likewise.
-	* config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186610 138bc75d-0d04-0410-961f-82ee72b054a4
-
-diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h
-index 4c811dc..8c04b3b 100644
---- a/gcc/config/alpha/linux-unwind.h
-+++ b/gcc/config/alpha/linux-unwind.h
-@@ -1,5 +1,5 @@
- /* DWARF2 EH unwinding support for Alpha Linux.
--   Copyright (C) 2004, 2005, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004, 2005, 2009, 2011, 2012 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -49,7 +49,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
-   else if (pc[1] == 0x201f015f)		/* lda $0,NR_rt_sigreturn */
-     {
-       struct rt_sigframe {
--	struct siginfo info;
-+	siginfo_t info;
- 	struct ucontext uc;
-       } *rt_ = context->cfa;
-       sc = &rt_->uc.uc_mcontext;
-diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h
-index 88c8285..15bb2f1 100644
---- a/gcc/config/bfin/linux-unwind.h
-+++ b/gcc/config/bfin/linux-unwind.h
-@@ -1,5 +1,5 @@
- /* DWARF2 EH unwinding support for Blackfin.
--   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 2007, 2009, 2012 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -48,10 +48,10 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
-     {
-       struct rt_sigframe {
- 	int sig;
--	struct siginfo *pinfo;
-+	siginfo_t *pinfo;
- 	void *puc;
- 	char retcode[8];
--	struct siginfo info;
-+	siginfo_t info;
- 	struct ucontext uc;
-       } *rt_ = context->cfa;
- 
-diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h
-index ad0ccfa..02b1897 100644
---- a/gcc/config/i386/linux-unwind.h
-+++ b/gcc/config/i386/linux-unwind.h
-@@ -136,9 +136,9 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
-     {
-       struct rt_sigframe {
- 	int sig;
--	struct siginfo *pinfo;
-+	siginfo_t *pinfo;
- 	void *puc;
--	struct siginfo info;
-+	siginfo_t info;
- 	struct ucontext uc;
-       } *rt_ = context->cfa;
-       /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/gcc/config/ia64/linux-unwind.h b/gcc/config/ia64/linux-unwind.h
-index 93f762d..da31259 100644
---- a/gcc/config/ia64/linux-unwind.h
-+++ b/gcc/config/ia64/linux-unwind.h
-@@ -1,5 +1,5 @@
- /* DWARF2 EH unwinding support for IA64 Linux.
--   Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc.
- 
-    This file is part of GCC.
- 
-@@ -47,7 +47,7 @@ ia64_fallback_frame_state (struct _Unwind_Context *context,
-       struct sigframe {
- 	char scratch[16];
- 	unsigned long sig_number;
--	struct siginfo *info;
-+	siginfo_t *info;
- 	struct sigcontext *sc;
-       } *frame_ = (struct sigframe *)context->psp;
-       struct sigcontext *sc = frame_->sc;
-@@ -137,7 +137,7 @@ ia64_handle_unwabi (struct _Unwind_Context *context, _Unwind_FrameState *fs)
-       struct sigframe {
- 	char scratch[16];
- 	unsigned long sig_number;
--	struct siginfo *info;
-+	siginfo_t *info;
- 	struct sigcontext *sc;
-       } *frame = (struct sigframe *)context->psp;
-       struct sigcontext *sc = frame->sc;
-diff --git a/gcc/config/mips/linux-unwind.h b/gcc/config/mips/linux-unwind.h
-index 02f7cd5..094ff58 100644
---- a/gcc/config/mips/linux-unwind.h
-+++ b/gcc/config/mips/linux-unwind.h
-@@ -1,5 +1,6 @@
- /* DWARF2 EH unwinding support for MIPS Linux.
--   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Free Software
-+   Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -75,7 +76,7 @@ mips_fallback_frame_state (struct _Unwind_Context *context,
-       struct rt_sigframe {
- 	u_int32_t ass[4];  /* Argument save space for o32.  */
- 	u_int32_t trampoline[2];
--	struct siginfo info;
-+	siginfo_t info;
- 	_sig_ucontext_t uc;
-       } *rt_ = context->cfa;
-       sc = &rt_->uc.uc_mcontext;
-diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h
-index a0560e9..38b4eda 100644
---- a/gcc/config/pa/linux-unwind.h
-+++ b/gcc/config/pa/linux-unwind.h
-@@ -1,5 +1,5 @@
- /* DWARF2 EH unwinding support for PA Linux.
--   Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -63,7 +63,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
-   int i;
-   struct sigcontext *sc;
-   struct rt_sigframe {
--    struct siginfo info;
-+    siginfo_t info;
-     struct ucontext uc;
-   } *frame;
- 
-diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h
-index 94ed95d..5a78e31 100644
---- a/gcc/config/sh/linux-unwind.h
-+++ b/gcc/config/sh/linux-unwind.h
-@@ -1,5 +1,6 @@
- /* DWARF2 EH unwinding support for SH Linux.
--   Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 2004, 2005, 2006, 2007, 2009, 2012 Free Software Foundation,
-+   Inc.
- 
- This file is part of GCC.
- 
-@@ -80,9 +81,9 @@ shmedia_fallback_frame_state (struct _Unwind_Context *context,
- 	   && (*(unsigned long *) (pc+11)  == 0x6ff0fff0))
-     {
-       struct rt_sigframe {
--	struct siginfo *pinfo;
-+	siginfo_t *pinfo;
- 	void *puc;
--	struct siginfo info;
-+	siginfo_t info;
- 	struct ucontext uc;
-       } *rt_ = context->cfa;
-       /* The void * cast is necessary to avoid an aliasing warning.
-@@ -179,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
- 		&& (*(unsigned short *) (pc+14)  == 0x00ad))))
-     {
-       struct rt_sigframe {
--	struct siginfo info;
-+	siginfo_t info;
- 	struct ucontext uc;
-       } *rt_ = context->cfa;
-       /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h
-index 32e9349..2456497 100644
---- a/gcc/config/xtensa/linux-unwind.h
-+++ b/gcc/config/xtensa/linux-unwind.h
-@@ -1,5 +1,5 @@
- /* DWARF2 EH unwinding support for Xtensa.
--   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2012 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -62,7 +62,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
-   struct sigcontext *sc;
- 
-   struct rt_sigframe {
--    struct siginfo info;
-+    siginfo_t info;
-     struct ucontext uc;
-   } *rt_;
- 
--- 
-1.7.3.4
-
diff --git a/pkgs/development/compilers/gcc/4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix
index fd347aa8bda2..ca50160def46 100644
--- a/pkgs/development/compilers/gcc/4.6/sources.nix
+++ b/pkgs/development/compilers/gcc/4.6/sources.nix
@@ -1,31 +1,27 @@
 /* Automatically generated by `update-gcc.sh', do not edit.
-   For GCC 4.6.3.  */
+   For GCC 4.6.4.  */
 { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda,
   langGo }:
 
-assert version == "4.6.3";
+assert version == "4.6.4";
 optional /* langC */ true (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-  sha256 = "283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1";
+  sha256 = "48b566f1288f099dff8fba868499a320f83586245ec69b8c82a9042566a5bf62";
 }) ++
 optional langCC (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-  sha256 = "b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8";
+  sha256 = "4eaa347f9cd3ab7d5e14efbb9c5c03009229cd714b558fc55fa56e8996b74d42";
 }) ++
 optional langFortran (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-  sha256 = "fe1bdf3485f33e6d0a998ff7bcb42526fbf3083dbfc107c3d95a88c00739eadb";
+  sha256 = "4f402e0d27995a02354570f0a63047f27463c72c62f1ba3c08ef5a7c6c9c3d1c";
 }) ++
 optional langJava (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
-  sha256 = "d0f9aafbd8fe95fdee5797cd02a9a734de0078aa62a9a249b0752adabf76d6e6";
+  sha256 = "4441d0c3cc04f2162f981c6b4bf29cdd9f6c16d294ce24c6bc4a05d8277abf28";
 }) ++
 optional langAda (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
-  sha256 = "7bb213ec3948646df72720580fcba3489c84aa452bd0e4238712607ef83cbdf6";
-}) ++
-optional langGo (fetchurl {
-  url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2";
-  sha256 = "7589c16f33ad383769510bb5b9c1aeb7f865f3ae0b89b07b2370d988a4c1fe6d";
+  sha256 = "2a09bbf942b2557839722d4807e67559123037356f5cb1a3b12f44539968d0ad";
 }) ++
 []