Fri Dec 9 23:14:52 UTC 2011

6 files changed, 63 insertions, 29 deletions

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 6e37940ad..7281e8ce8 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 135920 2011-08-20 07:14:19Z allan $
+# $Id: PKGBUILD 144850 2011-12-08 12:17:07Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.21.1
+pkgver=2.22
 pkgrel=2
-_date=20110627
+_date=20111201
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
-groups=('base')
+groups=('base-devel')
 depends=('glibc>=2.14' 'zlib')
 checkdepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('2face559e80d649ba148e42bb2d1fb0f')
+md5sums=('77c15027ac112c65fd5f73ca91b0651c')
 
 mksource() {
   mkdir ${pkgname}-${_date}
   cd ${pkgname}-${_date}
-  export _TAG=binutils-2_21-branch
+  export _TAG=binutils-2_22-branch
   export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src'
   cvs -z9 co -r $_TAG binutils || return 1
   mv src binutils
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index cb27de18c..1fb2370ff 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139748 2011-10-04 21:10:33Z allan $
+# $Id: PKGBUILD 144854 2011-12-08 12:17:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=fakeroot
-pkgver=1.18.1
+pkgver=1.18.2
 pkgrel=1
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ install=fakeroot.install
 depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
 options=('!libtool')
 source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('8eedda3dcb71b6ab6f62297b82ae5ac6')
+md5sums=('79f32331358ad58499704ea5e19fd0ae')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 9d324aff9..409794f25 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141368 2011-10-30 06:46:42Z allan $
+# $Id: PKGBUILD 144846 2011-12-08 12:16:58Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,25 +6,27 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.6.2
-pkgrel=1
-#_snapshot=4.6-20110819
+pkgrel=3
+_snapshot=4.6-20111125
 _libstdcppmanver=20110814		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
-	gcc-hash-style-both.patch)
-md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
+	gcc-hash-style-both.patch
+	gcc-pr49720.patch)
+md5sums=('922b0ee688669c188d237bbd21d42d07'
          'ce920d2550ff7e042b9f091d27764d8f'
          '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f')
+         '4df25b623799b148a0703eaeec8fdf3f'
+         'f9d7e5b792c59175f3da3f8421447512')
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -46,6 +48,9 @@ build() {
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
+  # fix compiler segfault in binutils testsuite
+  patch -Np1 -i ${srcdir}/gcc-pr49720.patch
+
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
@@ -113,7 +118,7 @@ package_gcc-libs()
 package_gcc()
 {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl')
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
   groups=('base-devel')
   install=gcc.install
 
diff --git a/core/gcc/gcc-pr49720.patch b/core/gcc/gcc-pr49720.patch
new file mode 100644
index 000000000..8f50c4120
--- /dev/null
+++ b/core/gcc/gcc-pr49720.patch
@@ -0,0 +1,26 @@
+--- trunk/gcc/simplify-rtx.c	2011/10/28 05:55:10	180603
++++ trunk/gcc/simplify-rtx.c	2011/10/28 06:35:31	180604
+@@ -4352,10 +4352,20 @@
+     {
+       rtx x = XEXP (op0, 0);
+       rtx c = XEXP (op0, 1);
++      enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS;
++      rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c);
+ 
+-      c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS,
+-			       cmp_mode, op1, c);
+-      return simplify_gen_relational (code, mode, cmp_mode, x, c);
++      /* Detect an infinite recursive condition, where we oscillate at this
++	 simplification case between:
++	    A + B == C  <--->  C - B == A,
++	 where A, B, and C are all constants with non-simplifiable expressions,
++	 usually SYMBOL_REFs.  */
++      if (GET_CODE (tem) == invcode
++	  && CONSTANT_P (x)
++	  && rtx_equal_p (c, XEXP (tem, 1)))
++	return NULL_RTX;
++
++      return simplify_gen_relational (code, mode, cmp_mode, x, tem);
+     }
+ 
+   /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index dd77756e3..0be9ebb2f 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141374 2011-10-30 06:48:27Z allan $
+# $Id: PKGBUILD 144848 2011-12-08 12:17:04Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,14 +6,14 @@
 
 pkgname=glibc
 pkgver=2.14.1
-pkgrel=1
+pkgrel=2
 _glibcdate=20111025
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=3.0' 'tzdata')
+depends=('linux-api-headers>=3.1' 'tzdata')
 makedepends=('gcc>=4.6')
 backup=(etc/gai.conf
         etc/locale.gen
diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD
index cc3c67a28..bb8c88799 100644
--- a/core/linux-api-headers/PKGBUILD
+++ b/core/linux-api-headers/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 135918 2011-08-20 07:14:16Z allan $
+# $Id: PKGBUILD 144852 2011-12-08 12:17:11Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-api-headers
-pkgver=3.0.1
-_basever=3.0
+pkgver=3.1.4
+_basever=3.1
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64')
@@ -14,10 +14,13 @@ license=('GPL2')
 provides=("kernel-headers=${pkgver}")
 conflicts=('kernel-headers')
 replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v${_basever}/linux-${_basever}.tar.bz2
-	http://www.kernel.org/pub/linux/kernel/v${_basever}/patch-${pkgver}.bz2)
-md5sums=('398e95866794def22b12dfbc15ce89c0'
-         'ac49f7907f1fc85fbab92d0f1aa1552a')
+source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
+	http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz)
+# NOTE: signatures are not automatically verified by makepkg
+        #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
+	#http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
+md5sums=('edbdc798f23ae0f8045c82f6fa22c536'
+         'ffb768bb3c42c94876f3f84aa6f779e5')
 
 build() {
   cd ${srcdir}/linux-${_basever}