upgpkg: gcc6 6.5.0-4

Fixed build, cleaned up namcap as much as I can.

4 files changed, 159 insertions, 145 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92cbdf617da1..469e623486fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,37 +18,51 @@ pkgbase = gcc6
 	makedepends = gtk2
 	makedepends = libart-lgpl
 	makedepends = libxtst
+	makedepends = zlib
+	makedepends = java-runtime
 	options = !emptydirs
 	source = https://gcc.gnu.org/pub/gcc/releases/gcc-6.5.0/gcc-6.5.0.tar.xz
 	source = https://gcc.gnu.org/pub/gcc/infrastructure/isl-0.18.tar.bz2
 	source = http://www.bastoul.net/cloog/pages/download/cloog-0.18.4.tar.gz
 	source = libsanitizer.patch
+	source = c89
+	source = c99
 	sha512sums = ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 	sha512sums = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
 	sha512sums = d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
 	sha512sums = e7861f77d54ac9bc12cfc6d3498a9bc284e72f728435c23866ac0763fb93e94e431d819c3def9f5aa03acbafc437141882e7b3746f4574ec6e5eb66b555cebb6
+	sha512sums = a02da589b23e4a76b5ca3b3e4e2261ef4cf69dadd9460703f14e34090d4e574025a52acef9f54e897679115e2122b0095d9d7eab556024bb0e9c695915951a58
+	sha512sums = d17176547a1ed2b7aa4743eb66a06308db182a993985a1905b418dfa46b74723631b17fd0d536adfefbdf4900d3b71cdf1e7d663ad379fa11b58b613dccb931c
 
 pkgname = gcc6
-	pkgdesc = The GNU Compiler Collection - C and C++ frontends
+	pkgdesc = The GNU Compiler Collection - C and C++ frontends (6.x.x)
 	depends = gcc6-libs=6.5.0-4
 	depends = binutils>=2.28
 	depends = libmpc
+	depends = zlib
+	options = !emptydirs
 	options = staticlibs
 
 pkgname = gcc6-libs
-	pkgdesc = Runtime libraries shipped by GCC
+	pkgdesc = Runtime libraries shipped by GCC (6.x.x)
 	depends = glibc>=2.25
+	depends = zlib
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc6-fortran
 	pkgdesc = Fortran front-end for GCC
 	depends = gcc6=6.5.0-4
-	options = !emptydirs
+	depends = zlib
+	depends = libmpc
 
 pkgname = gcc6-gcj
 	pkgdesc = Java front-end for GCC
 	depends = gcc6=6.5.0-4
+	depends = libmpc
+	depends = libxtst
+	depends = gtk2
+	depends = java-runtime
+	depends = libsm
 	replaces = gcc-gcj
-	options = !emptydirs
 
diff --git a/PKGBUILD b/PKGBUILD
index fe259c1ea042..f0368df20ff5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 pkgbase=gcc6
 pkgname=('gcc6' 'gcc6-libs' 'gcc6-fortran' 'gcc6-gcj')
 pkgver=6.5.0
-_ver=6
+_ver=${pkgver%%.*}
 _islver=0.18
 _cloogver=0.18.4
 pkgrel=4
@@ -19,24 +19,30 @@ pkgdesc="The GNU Compiler Collection (6.x.x)"
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
 url="https://gcc.gnu.org/gcc-6/"
-makedepends=(binutils libmpc doxygen subversion java-environment-common zip jdk8-openjdk gtk2 libart-lgpl libxtst)
+makedepends=(binutils libmpc doxygen subversion java-environment-common zip jdk8-openjdk gtk2 libart-lgpl libxtst zlib java-runtime)
 options=(!emptydirs)
 source=("https://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz"
         "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2"
         "http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz"
         "libsanitizer.patch"
+        "c89"
+        "c99"
 )
 sha512sums=('ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac'
             '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94'
             'd35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23'
-            'e7861f77d54ac9bc12cfc6d3498a9bc284e72f728435c23866ac0763fb93e94e431d819c3def9f5aa03acbafc437141882e7b3746f4574ec6e5eb66b555cebb6')
+            'e7861f77d54ac9bc12cfc6d3498a9bc284e72f728435c23866ac0763fb93e94e431d819c3def9f5aa03acbafc437141882e7b3746f4574ec6e5eb66b555cebb6'
+            'a02da589b23e4a76b5ca3b3e4e2261ef4cf69dadd9460703f14e34090d4e574025a52acef9f54e897679115e2122b0095d9d7eab556024bb0e9c695915951a58'
+            'd17176547a1ed2b7aa4743eb66a06308db182a993985a1905b418dfa46b74723631b17fd0d536adfefbdf4900d3b71cdf1e7d663ad379fa11b58b613dccb931c')
 
 _libdir="/usr/lib/gcc/$CHOST/$pkgver"
 
 prepare() {
-  cd gcc-$pkgver
+  [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
+  cd gcc
 
-  patch --forward --strip=2 --input="${srcdir}/libsanitizer.patch"
+  # Apply patches.
+  patch --forward --strip=2 --input="${srcdir}"/libsanitizer.patch
 
   # Link isl/cloog for in-tree builds
   ln -sf "../isl-${_islver}" isl
@@ -54,11 +60,11 @@ prepare() {
   # Arch uses python version 3 as default python (for gcc6-gcj).
   sed -i '1s+python+python2+' libjava/contrib/aot-compile.in
 
-  mkdir -p "${srcdir}/gcc-build"
+  mkdir -p "${srcdir}"/gcc-build
 }
 
 build() {
-  export LD_PRELOAD=/usr/lib/libstdc++.so
+  #export LD_PRELOAD=/usr/lib/libstdc++.so
 
   cd gcc-build
 
@@ -67,97 +73,106 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  "${srcdir}/gcc-$pkgver/configure" \
+  "${srcdir}/gcc/configure" \
     --prefix=/usr \
+    --build="${CHOST}" \
     --libdir=/usr/lib \
     --libexecdir=/usr/lib \
     --mandir=/usr/share/man \
     --infodir=/usr/share/info \
     --with-bugurl=https://bugs.archlinux.org/ \
     --enable-languages=c,c++,fortran,lto,java \
-    --enable-shared \
-    --enable-threads=posix \
-    --enable-libmpx \
-    --with-system-zlib \
     --with-isl \
+    --with-linker-hash-style=gnu \
+    --with-system-zlib \
     --enable-__cxa_atexit \
-    --disable-libunwind-exceptions \
+    --enable-cet=auto \
+    --enable-checking=release \
     --enable-clocale=gnu \
-    --disable-libstdcxx-pch \
-    --disable-libssp \
+    --enable-default-pie \
+    --enable-default-ssp \
+    --enable-gnu-indirect-function \
     --enable-gnu-unique-object \
+    --disable-install-libiberty \
     --enable-linker-build-id \
     --enable-lto \
-    --enable-plugin \
-    --with-linker-hash-style=gnu \
-    --enable-gnu-indirect-function \
     --disable-multilib \
+    --enable-plugin \
+    --enable-shared \
+    --enable-threads=posix \
+    --disable-libssp \
+    --disable-libstdcxx-pch \
+    --disable-libunwind-exceptions \
     --disable-werror \
-    --enable-checking=release \
     --enable-java-awt=gtk \
     --with-java-home="$JAVA_HOME" \
     --enable-libgcj-multifile \
-    --enable-default-pie \
-    --enable-default-ssp \
     --enable-version-specific-runtime-libs \
-    --program-suffix=-${_ver} \
-    --build="${CHOST}"
+    --program-suffix=-${_ver}
 
   make
 
   # make documentation
-  make -C "${CHOST}/libstdc++-v3/doc" doc-man-doxygen
+  make -C "${CHOST}"/libstdc++-v3/doc doc-man-doxygen
+}
+
+check() {
+  cd gcc-build
+
+  make -k check || true
+  "${srcdir}/gcc/contrib/test_summary"
 }
 
 package_gcc6-libs() {
-  pkgdesc="Runtime libraries shipped by GCC"
-  depends=('glibc>=2.25')
-  options=('!emptydirs' '!strip')
+  pkgdesc="Runtime libraries shipped by GCC (6.x.x)"
+  depends=('glibc>=2.25' zlib)
+  options+=(!strip)
 
-  export LD_PRELOAD=/usr/lib/libstdc++.so
+  #export LD_PRELOAD=/usr/lib/libstdc++.so
 
   cd gcc-build
   make -C "$CHOST"/libgcc DESTDIR="${pkgdir}" install-shared
-  rm "${pkgdir}/${_libdir}/libgcc_eh.a"
-  mv "${pkgdir}/usr/lib/gcc/$CHOST/lib/libgcc_s.so*" "$pkgdir/$_libdir"
+  rm "${pkgdir}"/"${_libdir}"/libgcc_eh.a
+  mv "${pkgdir}"/usr/lib/gcc/"$CHOST"/lib/libgcc_s.so* "${pkgdir}"/"${_libdir}"
 
   for lib in libatomic \
-    libcilkrts \
-    libjava \
-    libgfortran \
-    libgomp \
-    libitm \
-    libquadmath \
-    libsanitizer/{a,l,ub}san \
-    libstdc++-v3/src \
-    libvtv; do
+             libcilkrts \
+             libjava \
+             libgfortran \
+             libgomp \
+             libitm \
+             libquadmath \
+             libsanitizer/{a,l,ub}san \
+             libstdc++-v3/src \
+             libvtv; do
     make -C "$CHOST/$lib" DESTDIR="${pkgdir}" install-toolexeclibLTLIBRARIES
   done
 
   make -C "$CHOST"/libsanitizer/tsan DESTDIR="${pkgdir}" install-toolexeclibLTLIBRARIES
-
   make -C "$CHOST"/libstdc++-v3/po DESTDIR="${pkgdir}" install
-  make -C "$CHOST"/libmpx DESTDIR="${pkgdir}" install
-  rm "${pkgdir}/${_libdir}/libmpx.spec"
+  #make -C "$CHOST"/libmpx DESTDIR="${pkgdir}" install
+  #rm "${pkgdir}"/"${_libdir}"/libmpx.spec
 
-  for lib in libgomp libitm libquadmath; do
-    make -C "$CHOST/$lib" DESTDIR="${pkgdir}" install-info
+  for lib in libgomp \
+             libitm \
+             libquadmath; do
+    make -C "$CHOST"/"$lib" DESTDIR="${pkgdir}" install-info
   done
 
   # Lazy way of dealing with conflicting files...
-  rm -rf "${pkgdir}/usr/share/{info,locale,man}"
+  rm -rf "${pkgdir}"/usr/share/{info,locale,man}
 
   # Install Runtime Library Exception
-  install -Dm644 "${srcdir}/gcc-$pkgver/COPYING.RUNTIME" \
-    "${pkgdir}/usr/share/licenses/$pkgbase/RUNTIME.LIBRARY.EXCEPTION"
+  install -Dm644 "${srcdir}"/gcc-$pkgver/COPYING.RUNTIME \
+    "${pkgdir}"/usr/share/licenses/$pkgbase/RUNTIME.LIBRARY.EXCEPTION
 }
 
 package_gcc6() {
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc6-libs=${pkgver}-${pkgrel}" 'binutils>=2.28' 'libmpc')
-  options=('staticlibs')
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends (6.x.x)"
+  depends=("gcc6-libs=${pkgver}-${pkgrel}" 'binutils>=2.28' libmpc zlib)
+  options+=(staticlibs)
 
-  export LD_PRELOAD=/usr/lib/libstdc++.so
+  #export LD_PRELOAD=/usr/lib/libstdc++.so
 
   cd gcc-build
 
@@ -169,7 +184,7 @@ package_gcc6() {
   done
 
   make -C "$CHOST"/libgcc DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/lib/gcc/${CHOST}/lib*"
+  rm -rf "${pkgdir}"/usr/lib/gcc/"${CHOST}"/lib*
 
   make -C "$CHOST"/libstdc++-v3/src DESTDIR="${pkgdir}" install
   make -C "$CHOST"/libstdc++-v3/include DESTDIR="${pkgdir}" install
@@ -178,110 +193,71 @@ package_gcc6() {
 
   make DESTDIR="${pkgdir}" install-libcc1
   install -d "$pkgdir"/usr/share/gdb/auto-load/usr/lib
-  #mv "${pkgdir}/${_libdir}/libstdc++.so.6.*-gdb.py" \
+  #mv "${pkgdir}"/${_libdir}/libstdc++.so.6.*-gdb.py \
   #  "${pkgdir}/usr/share/gdb/auto-load/{_libdir}/"
-  rm "${pkgdir}/${_libdir}/libstdc++.so*"
+  rm "${pkgdir}"/"${_libdir}"/libstdc++.so*
 
   make DESTDIR="${pkgdir}" install-fixincludes
   make -C gcc DESTDIR="${pkgdir}" install-mkheaders
 
   make -C lto-plugin DESTDIR="${pkgdir}" install
   install -dm755 "${pkgdir}"/usr/lib/bfd-plugins/
-  ln -s "${_libdir}/liblto_plugin.so" "${pkgdir}/usr/lib/bfd-plugins/"
+  ln -s "${_libdir}"/liblto_plugin.so "${pkgdir}"/usr/lib/bfd-plugins/
 
-  make -C "$CHOST"/libcilkrts DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS \
-    install-nodist_cilkincludeHEADERS
-  make -C "$CHOST"/libgomp DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS \
-    install-nodist_libsubincludeHEADERS
+  make -C "$CHOST"/libcilkrts DESTDIR="${pkgdir}" install-nodist_{cilkinclude,toolexeclib}HEADERS
+  make -C "$CHOST"/libgomp DESTDIR="${pkgdir}" install-nodist_{libsubinclude,toolexeclib}HEADERS
   make -C "$CHOST"/libitm DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS
   make -C "$CHOST"/libquadmath DESTDIR="${pkgdir}" install-nodist_libsubincludeHEADERS
   make -C "$CHOST"/libsanitizer DESTDIR="${pkgdir}" install-nodist_{saninclude,toolexeclib}HEADERS
   make -C "$CHOST"/libsanitizer/asan DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS
-  make -C "$CHOST"/libmpx DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS
+  #make -C "$CHOST"/libmpx DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS
 
   make -C gcc DESTDIR="${pkgdir}" install-man install-info
-  rm "${pkgdir}/usr/share/man/man1/gfortran-${_ver}.1"
-  rm "${pkgdir}/usr/share/info/gfortran.info"
+  rm "${pkgdir}"/usr/share/man/man1/gfortran-${_ver}.1
+  rm "${pkgdir}"/usr/share/info/gfortran.info
 
   make -C libcpp DESTDIR="${pkgdir}" install
   make -C gcc DESTDIR="${pkgdir}" install-po
 
   # many packages expect this symlink
-  ln -s "gcc-${_ver}" "${pkgdir}/usr/bin/cc-${_ver}"
+  ln -s "gcc-${_ver}" "${pkgdir}"/usr/bin/cc-${_ver}
 
   # POSIX conformance launcher scripts for c89 and c99
-  cat > "$pkgdir/usr/bin/c89-${_ver}" << "EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-            exit 1;;
-  esac
-done
-exec gcc-${_ver} $fl ${1+"$@"}
-EOF
-
-  cat > "$pkgdir/usr/bin/c99-${_ver}" << "EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-            exit 1;;
-  esac
-done
-exec gcc-${_ver} $fl ${1+"$@"}
-EOF
-
-  chmod 755 "$pkgdir/usr/bin/c{8,9}9-${_ver}"
-
-  # Install Runtime Library Exception
-  install -d "${pkgdir}/usr/share/licenses/$pkgbase/"
-  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION "${pkgdir}/usr/share/licenses/$pkgbase"
+  install -Dm755 "${srcdir}/c89" "${pkgdir}/usr/bin/c89-${_ver}"
+  install -Dm755 "${srcdir}/c99" "${pkgdir}/usr/bin/c99-${_ver}"
 
   # Lazy way of dealing with conflicting files...
-  rm -rf "${pkgdir}/usr/share/{info,locale,man}"
+  rm -rf "${pkgdir}"/usr/share/{info,locale,man}
 
   # Move potentially conflicting stuff to version specific subdirectory
-  #[[ -d ${pkgdir}/usr/lib/gcc/${CHOST}/lib/ ]] && mv ${pkgdir}/usr/lib/gcc/${CHOST}/lib/lib* \
-  #               ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/
-  mv "$pkgdir/usr/lib/bfd-plugins/liblto_plugin.so" "${pkgdir}/usr/lib/bfd-plugins/liblto_plugin-${_ver}.so"
-  mv "${pkgdir}/usr/lib/*.so*" "${pkgdir}/${_libdir}/"
-  install -Dm755 gcc/cc1 "${pkgdir}/${_libdir}/cc1"
-  install -Dm755 gcc/cc1plus "${pkgdir}/${_libdir}/cc1plus"
+  mv "${pkgdir}"/usr/lib/bfd-plugins/liblto_plugin.so "${pkgdir}"/usr/lib/bfd-plugins/liblto_plugin-${_ver}.so
+  mv "${pkgdir}"/usr/lib/*.so* "${pkgdir}"/"${_libdir}"/
+  install -Dm755 gcc/cc1 "${pkgdir}"/"${_libdir}"/cc1
+  install -Dm755 gcc/cc1plus "${pkgdir}"/"${_libdir}"/cc1plus
 }
 
 package_gcc6-fortran() {
   pkgdesc="Fortran front-end for GCC"
-  depends=("gcc6=$pkgver-$pkgrel")
-  options=('!emptydirs')
+  depends=("gcc6=$pkgver-$pkgrel" zlib libmpc)
 
-  export LD_PRELOAD=/usr/lib/libstdc++.so
+  #export LD_PRELOAD=/usr/lib/libstdc++.so
 
   cd gcc-build
-  make -C "$CHOST/libgfortran" DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
+  make -C "$CHOST"/libgfortran DESTDIR="${pkgdir}" install-cafexeclibLTLIBRARIES \
     install-{toolexeclibDATA,nodist_fincludeHEADERS}
-  make -C "$CHOST/libgomp" DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
-  make -C gcc DESTDIR="$pkgdir" fortran.install-common
-  install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
+  make -C "$CHOST"/libgomp DESTDIR="${pkgdir}" install-nodist_fincludeHEADERS
+  make -C gcc DESTDIR="${pkgdir}" fortran.install-common
+  install -Dm755 gcc/f951 "${pkgdir}/${_libdir}/f951"
 
-  ln -s gfortran-6 "${pkgdir}/usr/bin/f95-${_ver}"
-
-  # Install Runtime Library Exception
-  install -d "${pkgdir}/usr/share/licenses/$pkgbase"
-  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION "${pkgdir}/usr/share/licenses/$pkgbase/"
+  ln -s gfortran-${_ver} "${pkgdir}"/usr/bin/f95-${_ver}
 }
 
 package_gcc6-gcj() {
   pkgdesc="Java front-end for GCC"
-  depends=("gcc6=$pkgver-$pkgrel")
+  depends=("gcc6=$pkgver-$pkgrel" libmpc libxtst gtk2 java-runtime libsm)
   replaces=('gcc-gcj')
-  options=('!emptydirs')
 
-  export LD_PRELOAD=/usr/lib/libstdc++.so
+  #export LD_PRELOAD=/usr/lib/libstdc++.so
 
   # Install libjava.
   cd gcc-build
@@ -291,33 +267,33 @@ package_gcc6-gcj() {
   cd gcc
   make -j1 DESTDIR="${pkgdir}" java.install-common java.install-man
 
-  install -m755 jc1 "${pkgdir}/${_libdir}/"
-  install -m755 jvgenmain "${pkgdir}/${_libdir}/"
+  install -m755 jc1 "${pkgdir}"/"${_libdir}"/
+  install -m755 jvgenmain "${pkgdir}"/"${_libdir}"/
 
   # Remove conflicting files.
-  rm "${pkgdir}/${_libdir}/libg{cj,ij}*.so*"
+  rm "${pkgdir}"/"${_libdir}"/libg{cj,ij}*.so*
+  rm "${pkgdir}"/"${_libdir}"/libgcc_eh.a
+  rm "${pkgdir}"/"${_libdir}"/crtbegin.o
+  rm "${pkgdir}"/"${_libdir}"/crtbeginS.o
+  rm "${pkgdir}"/"${_libdir}"/crtbeginT.o
+  rm "${pkgdir}"/"${_libdir}"/crtend.o
+  rm "${pkgdir}"/"${_libdir}"/crtendS.o
+  rm "${pkgdir}"/"${_libdir}"/crtfastmath.o
+  rm "${pkgdir}"/"${_libdir}"/crtprec32.o
+  rm "${pkgdir}"/"${_libdir}"/crtprec64.o
+  rm "${pkgdir}"/"${_libdir}"/crtprec80.o
+  rm "${pkgdir}"/"${_libdir}"/include/unwind.h
+  rm "${pkgdir}"/"${_libdir}"/libgcc.a
+  rm "${pkgdir}"/"${_libdir}"/libgcov.a
 
   # Rename two files to not conflict to classpath
-  mv "${pkgdir}/usr/share/info/cp-tools.info" "${pkgdir}/usr/share/info/cp-tools-gcj.info"
-
-  linkdir=$(basename "$pkgdir/usr/lib/gcj-${pkgver}*")
-  ln -sf "$linkdir" "${pkgdir}/usr/lib/gcj-${pkgver%.?}"
-  ln -sf "libgcj-${pkgver}.jar" "${pkgdir}/usr/share/java/libgcj-${pkgver%.?}.jar"
-  ln -sf "libgcj-${pkgver}.jar" "${pkgdir}/usr/share/java/libgcj.jar"
-  ln -sf "libgcj-tools-${pkgver}.jar" "${pkgdir}/usr/share/java/libgcj-tools-${pkgver%.?}.jar"
-  ln -sf "libgcj-tools-${pkgver}.jar" "${pkgdir}/usr/share/java/libgcj-tools.jar"
-
-  rm "${pkgdir}/${_libdir}/libgcc_eh.a"
-  rm "${pkgdir}/${_libdir}/crtbegin.o"
-  rm "${pkgdir}/${_libdir}/crtbeginS.o"
-  rm "${pkgdir}/${_libdir}/crtbeginT.o"
-  rm "${pkgdir}/${_libdir}/crtend.o"
-  rm "${pkgdir}/${_libdir}/crtendS.o"
-  rm "${pkgdir}/${_libdir}/crtfastmath.o"
-  rm "${pkgdir}/${_libdir}/crtprec32.o"
-  rm "${pkgdir}/${_libdir}/crtprec64.o"
-  rm "${pkgdir}/${_libdir}/crtprec80.o"
-  rm "${pkgdir}/${_libdir}/include/unwind.h"
-  rm "${pkgdir}/${_libdir}/libgcc.a"
-  rm "${pkgdir}/${_libdir}/libgcov.a"
+  mv "${pkgdir}"/usr/share/info/cp-tools.info "${pkgdir}"/usr/share/info/cp-tools-gcj.info
+
+  linkdir=$(basename "{$pkgdir}"/usr/lib/gcj-${pkgver%.*})
+  ln -sf "$linkdir" "${pkgdir}"/usr/lib/gcj-${pkgver%.*}
+  ln -sf "libgcj-${pkgver}.jar" "${pkgdir}"/usr/share/java/libgcj-${pkgver%.?}.jar
+  ln -sf "libgcj-${pkgver}.jar" "${pkgdir}"/usr/share/java/libgcj.jar
+  ln -sf "libgcj-tools-${pkgver}.jar" "${pkgdir}"/usr/share/java/libgcj-tools-${pkgver%.?}.jar
+  ln -sf "libgcj-tools-${pkgver}.jar" "${pkgdir}"/usr/share/java/libgcj-tools.jar
+
 }
diff --git a/c89 b/c89
new file mode 100644
index 000000000000..1845ae3f292d
--- /dev/null
+++ b/c89
@@ -0,0 +1,12 @@
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi | -std=c89 | -std=iso9899:1990) fl="" ;;
+    -std=*)
+      echo "$(basename $0) called with non ANSI/ISO C option $opt" >&2
+      exit 1
+      ;;
+  esac
+done
+exec gcc-${_ver} $fl ${1+"$@"}
diff --git a/c99 b/c99
new file mode 100644
index 000000000000..33c9703c559d
--- /dev/null
+++ b/c99
@@ -0,0 +1,12 @@
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99 | -std=iso9899:1999) fl="" ;;
+    -std=*)
+      echo "$(basename $0) called with non ISO C99 option $opt" >&2
+      exit 1
+      ;;
+  esac
+done
+exec gcc-${_ver} $fl ${1+"$@"}