From 18d6577d511b9a1ac36eaae50060133a401e42a3 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Wed, 27 Apr 2011 22:24:53 +0000
Subject: Wed Apr 27 22:24:53 UTC 2011

---
 multilib/gcc-multilib/PKGBUILD                  | 146 +++++++++++------
 multilib/gcc-multilib/gcc-ada.install           |   2 -
 multilib/gcc-multilib/gcc-fortran.install       |   2 -
 multilib/gcc-multilib/gcc-go.install            |  20 +++
 multilib/gcc-multilib/gcc-hash-style-both.patch | 209 ++++++++++--------------
 multilib/gcc-multilib/gcc-libs.install          |  12 +-
 multilib/gcc-multilib/gcc.install               |   2 -
 7 files changed, 203 insertions(+), 190 deletions(-)
 create mode 100644 multilib/gcc-multilib/gcc-go.install

(limited to 'multilib/gcc-multilib')

diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index b3ec427ea..5a1bfbd26 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 38863 2011-02-02 11:14:23Z ibiru $
+# $Id: PKGBUILD 45100 2011-04-16 13:45:55Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -6,32 +6,33 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib')
-pkgver=4.5.2
-pkgrel=6
-_snapshot=4.5-20110127
-_libstdcppmanver=4.5.2		# Note: check source directory name when updating this
+pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
+pkgver=4.6.0
+pkgrel=3
+_snapshot=4.6-20110415
+_libstdcppmanver=20110201		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
-license=('GPL' 'LGPL' 'custom')
+license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada-multilib' 'dejagnu'
-             'glibc>=2.11.1-2' 'lib32-glibc>=2.12.1')
+makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu'
+             'lib32-glibc>=2.12.1')
 options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,testsuite}-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,testsuite}-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api-${_libstdcppmanver}.man.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_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=('7dbdf06186dc98955221b2f7b987645b'
-         '4893036a98d8bedf44fe0741dfec6e1f'
-         'c741c614e975c858cffb9e78b0b5124f'
-         'b141fadc984cc0c1c0f15feb16db14e5'
-         '067672b640d0b912298791c1837606bc'
-         'daffd2ba5917a263cdff5f38dcf8c323'
-         '2776eab5ebb7f9cc62dd2199a3a24382'
+md5sums=('aed037654091d1f478dfcb6e13444325'
+         '8d4b78c03c1d477c6cb562d42f461958'
+         'c346e76014569b25e2869ff986d2ac2d'
+         '8376485de1c7aa90bb32f52f2372d451'
+         '0c2d89f9e2e614ad84c6e2aa239c5c1c'
+         '50bab6a0c9e5403ea77f57361dec5436'
+         '6e0032461f87ce60db6302ca652ae9d8'
+         '1e9fd2eaf0ee47ea64e82c48998f1999'
          '22cec272f9cc2801d3cd348feaca888b'
-         '6fd395bacbd7b6e47c7b74854b478363')
+         '4df25b623799b148a0703eaeec8fdf3f')
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -42,9 +43,6 @@ fi
 build() {
   cd ${_basedir}
 
-  # "Add" ppl-0.11 compatibility
-  sed -i "/ppl_minor_version=/s#10#11#" configure
-
   # Do not install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 
@@ -58,18 +56,26 @@ build() {
 
   cd ${srcdir}
   mkdir gcc-build && cd gcc-build
+
   ${_basedir}/configure --prefix=/usr \
-      --enable-languages=c,c++,fortran,objc,obj-c++,ada \
-      --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-      --enable-clocale=gnu --enable-gnu-unique-object \
-      --enable-lto --enable-plugin \
-      --enable-gold --with-plugin-ld=ld.gold \
-      --enable-multilib --disable-libstdcxx-pch \
-      --with-system-zlib --with-ppl \
-      --with-cloog --with-cloog-include=/usr/include/cloog-ppl \
       --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --enable-multilib --disable-libstdcxx-pch \
+      --enable-checking=release
   make
+}
+
+check() {
+  cd gcc-build
 
   # increase stack size to prevent test failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
@@ -96,11 +102,14 @@ package_gcc-libs-multilib()
   make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
   make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
 
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
   make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-
   make -j1 DESTDIR=${pkgdir} install-target-libobjc
-  # I thought I said to only install the lib...
-  rm -rf ${pkgdir}/usr/lib/gcc/
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+
+  # remove stuff in lib32-gcc-libs
   rm -rf ${pkgdir}/usr/lib32
 
   # remove static libraries
@@ -122,12 +131,16 @@ package_lib32-gcc-libs()
     make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
   done
 
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
   make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-
   make -j1 DESTDIR=${pkgdir} install-target-libobjc
 
-  # I thought I said to only install the lib...
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm ${pkgdir}/usr/lib32/libgfortran.spec
+
+  # remove stuff in gcc-libs-multilib
   rm -rf ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/share/info
 
   # remove static libraries
   find ${pkgdir} -name *.a -delete
@@ -140,7 +153,7 @@ package_lib32-gcc-libs()
 package_gcc-multilib()
 {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
-  depends=('binutils-multilib>=2.21' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils' \
+  depends=('binutils-multilib>=2.21' 'libmpc>=0.8.1-2' 'cloog' 'ppl'
            "gcc-libs-multilib=$pkgver-$pkgrel")
   groups=('multilib-devel')
   provides=("gcc=$pkgver-$pkgrel")
@@ -149,15 +162,20 @@ package_gcc-multilib()
 
   cd gcc-build
   
-  # much, much easier to install the lot and clean-up the mess
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
   make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{*gfortran,gnat*}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}/*
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,{,32/}libgfortranbegin.a}
-  rm $pkgdir/usr/lib{,32}/{*.so*,lib{gfortran,objc}.a}
-  rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp}.info
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib{,32}/*.so*
+  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib{,32}/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
+  rm -r $pkgdir/usr/lib{,32}/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
   rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/gfortran.1
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*
 
   # many packages require these symlinks
   install -dm755 ${pkgdir}/lib
@@ -196,8 +214,7 @@ EOF
 
   # install the libstdc++ man pages
   install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/libstdc++-api-${_libstdcppmanver}.man/man3/* \
-    ${pkgdir}/usr/share/man/man3/
+  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
@@ -213,13 +230,15 @@ package_gcc-fortran-multilib()
   install=gcc-fortran.install
 
   cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
   make -j1 DESTDIR=$pkgdir install-target-libgfortran
   make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
   make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
   install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
   
   # remove libraries included in gcc-libs
-  rm -f ${pkgdir}/usr/lib{,32}/libgfortran.so*
+  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info
   
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
@@ -239,7 +258,7 @@ package_gcc-objc-multilib()
   install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
 
   # remove libraries included in gcc-libs
-  rm -f ${pkgdir}/usr/lib{,32}/libobjc.so*
+  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
@@ -254,14 +273,33 @@ package_gcc-ada-multilib()
   conflicts=('gcc-ada')
   install=gcc-ada.install
 
-  cd gcc-build
-  make -j1 -C gcc DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gcc/gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-  make -j1 -C $CHOST/32/libada DESTDIR=${pkgdir} \
-    INSTALL="install" INSTALL_DATA="install -m644" install-gnatlib
+  cd gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+
+  cd ../$CHOST/32/libada
+  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
+    INSTALL_DATA="install -m644" install-gnatlib
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
 }
 
+package_gcc-go-multilib()
+{
+  pkgdesc="Go front-end for GCC for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-go=$pkgver-$pkgrel")
+  conflicts=('gcc-go')
+  install=gcc-go.install
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/multilib/gcc-multilib/gcc-ada.install b/multilib/gcc-multilib/gcc-ada.install
index 81794685f..df0553a4f 100644
--- a/multilib/gcc-multilib/gcc-ada.install
+++ b/multilib/gcc-multilib/gcc-ada.install
@@ -18,5 +18,3 @@ pre_remove() {
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/gcc-multilib/gcc-fortran.install b/multilib/gcc-multilib/gcc-fortran.install
index 2aeab7123..b15d89a97 100644
--- a/multilib/gcc-multilib/gcc-fortran.install
+++ b/multilib/gcc-multilib/gcc-fortran.install
@@ -14,5 +14,3 @@ pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/gcc-multilib/gcc-go.install b/multilib/gcc-multilib/gcc-go.install
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/multilib/gcc-multilib/gcc-go.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gccgo.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib/gcc-multilib/gcc-hash-style-both.patch b/multilib/gcc-multilib/gcc-hash-style-both.patch
index fbb210598..8b59f4535 100644
--- a/multilib/gcc-multilib/gcc-hash-style-both.patch
+++ b/multilib/gcc-multilib/gcc-hash-style-both.patch
@@ -1,47 +1,6 @@
-#! /bin/sh -e
-
-# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc)
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        #cd ${dir}gcc && autoconf
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        #rm ${dir}gcc/configure
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
-2006-07-11  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/i386/linux.h (LINK_SPEC): Add --hash-style=both.
-	* config/i386/linux64.h (LINK_SPEC): Likewise.
-	* config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise.
-	* config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32,
-	LINK_OS_LINUX_SPEC64): Likewise.
-	* config/s390/linux.h (LINK_SPEC): Likewise.
-	* config/ia64/linux.h (LINK_SPEC): Likewise.
-	* config/sparc/linux.h (LINK_SPEC): Likewise.
-	* config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC,
-	LINK_ARCH64_SPEC): Likewise.
-	* config/alpha/linux-elf.h (LINK_SPEC): Likewise.
-
---- gcc/config/alpha/linux-elf.h.orig	2007-08-04 08:55:58.000000000 +0200
-+++ gcc/config/alpha/linux-elf.h	2007-09-01 15:47:26.605865578 +0200
-@@ -39,7 +39,7 @@
+--- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
  
  #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
  
@@ -50,8 +9,68 @@ exit 0
    %{O*:-O3} %{!O*:-O1}						\
    %{shared:-shared}						\
    %{!shared:							\
---- gcc/config/s390/linux.h.orig	2007-08-04 08:55:59.000000000 +0200
-+++ gcc/config/s390/linux.h	2007-09-01 15:47:26.605865578 +0200
+--- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+ 
+--- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+ 
+--- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
 @@ -77,7 +77,7 @@
  
  #undef  LINK_SPEC
@@ -61,103 +80,43 @@ exit 0
     %{shared:-shared} \
     %{!shared: \
        %{static:-static} \
---- gcc/config/sparc/linux.h.orig	2007-08-04 08:56:01.000000000 +0200
-+++ gcc/config/sparc/linux.h	2007-09-01 15:47:26.605865578 +0200
-@@ -132,7 +132,7 @@
- 
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
---- gcc/config/sparc/linux64.h.orig	2007-08-04 08:56:01.000000000 +0200
-+++ gcc/config/sparc/linux64.h	2007-09-01 15:47:26.605865578 +0200
-@@ -166,7 +166,7 @@
+--- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
    { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
    { "link_arch",	 LINK_ARCH_SPEC },
  
 -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
 +#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
    %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -175,7 +175,7 @@
-         %{static:-static}}} \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
  "
  
 -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
 +#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
    %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -256,7 +256,7 @@
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
  #else /* !SPARC_BI_ARCH */
  
  #undef LINK_SPEC
 -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
 +#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
---- gcc/config/i386/linux.h.orig	2007-08-04 08:56:07.000000000 +0200
-+++ gcc/config/i386/linux.h	2007-09-01 15:47:26.605865578 +0200
-@@ -108,7 +108,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
---- gcc/config/i386/linux64.h.orig	2007-08-04 08:56:07.000000000 +0200
-+++ gcc/config/i386/linux64.h	2007-09-01 15:48:27.336781690 +0200
-@@ -65,7 +65,7 @@
- #endif
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
    %{!shared: \
      %{!static: \
---- gcc/config/ia64/linux.h.orig	2006-12-12 18:59:53.000000000 +0100
-+++ gcc/config/ia64/linux.h	2007-09-01 15:47:26.605865578 +0200
-@@ -40,7 +40,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
    %{!shared: \
      %{!static: \
---- gcc/config/rs6000/sysv4.h.orig	2007-08-08 23:37:49.000000000 +0200
-+++ gcc/config/rs6000/sysv4.h	2007-09-01 15:47:26.615865729 +0200
-@@ -901,7 +901,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}"
- 
---- gcc/config/rs6000/linux64.h.orig	2007-08-04 08:56:12.000000000 +0200
-+++ gcc/config/rs6000/linux64.h	2007-09-01 15:47:26.615865729 +0200
-@@ -354,11 +354,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}"
- 
diff --git a/multilib/gcc-multilib/gcc-libs.install b/multilib/gcc-multilib/gcc-libs.install
index b5fbf9211..23553b8f0 100644
--- a/multilib/gcc-multilib/gcc-libs.install
+++ b/multilib/gcc-multilib/gcc-libs.install
@@ -1,14 +1,16 @@
 infodir=usr/share/info
-file="libgomp.info"
+filelist=(libgomp.info libquadmath.info)
 
 post_upgrade() {
   [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
 }
 
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/gcc-multilib/gcc.install b/multilib/gcc-multilib/gcc.install
index a7a405288..3407a5e1f 100644
--- a/multilib/gcc-multilib/gcc.install
+++ b/multilib/gcc-multilib/gcc.install
@@ -18,5 +18,3 @@ pre_remove() {
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf