core/gcc to 4.7.2-4

core/gcc/PKGBUILD

@@ -15,7 +15,7 @@ noautobuild=1
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 pkgver=4.7.2
-pkgrel=3
+pkgrel=4
 #_snapshot=4.7-20120721
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -26,10 +26,8 @@ checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs' '!distcc')
 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
-        gcc_pure64.patch
         armhf-triplet-trunk.diff)
 md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         'ced48436c1b3c981d721a829f1094de1'
          'bd7330bd41845929f1e0efb3b7d0a060')
 
 if [ -n "${_snapshot}" ]; then
@@ -47,12 +45,13 @@ build() {
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-
   echo ${pkgver} > gcc/BASE-VER
 
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
+
   # ALARM: Specify build host types, triplet patch
   [[ $CARCH == "arm" ]] && CONFIGFLAG="--host=armv5tel-unknown-linux-gnueabi --build=armv5tel-unknown-linux-gnueabi"
   [[ $CARCH == "armv6h" ]] && CONFIGFLAG="--host=armv6l-unknown-linux-gnueabihf --build=armv6l-unknown-linux-gnueabihf --with-arch=armv6 --with-float=hard --with-fpu=vfp"

core/gcc/gcc_pure64.patch

@@ -1,26 +0,0 @@
-diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
---- gcc-orig/gcc/config/i386/linux64.h	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/linux64.h	2011-07-24 19:48:05.000000000 +1000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64	2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
- 
- LIBGCC = stmp-multilib