11 files changed, 501 insertions, 2 deletions
diff --git a/TODOS b/TODOS
index b3d436f..5d4fb81 100644
--- a/TODOS
+++ b/TODOS
@@ -5,3 +5,4 @@
 - makepkg with an 'alternate root' option (which doens't collide with
   pacman's options), avoids patching -r and --config into makepkg for
   stage1
+- shims and provides and depends don't work yet (binutils and glibc-shim)
diff --git a/build_stage1.sh b/build_stage1.sh
index fdeae00..f2d27a0 100755
--- a/build_stage1.sh
+++ b/build_stage1.sh
@@ -13,8 +13,9 @@ attr acl gmp gdbm db perl openssl
 zlib pambase cracklib libtirpc pam libcap coreutils
 util-linux e2fsprogs
 expat bzip2 lz4 xz pcre less gzip tar libarchive curl
-pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman
+pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman fakeroot
 elfutils
+make mpfr gawk libmpc binutils gcc
 sed texinfo grep findutils file diffutils ed patch
 kbd procps-ng shadow
 inetutils bc kmod linux uinit
diff --git a/build_stage1_package.sh b/build_stage1_package.sh
index 1baee72..f4aac23 100755
--- a/build_stage1_package.sh
+++ b/build_stage1_package.sh
@@ -73,7 +73,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -
 		find $ARCHLINUX32_PACKAGES/core/$PACKAGE/* ! -name PKGBUILD \
 			-exec cp {} . \;
 	fi
-	
+		
 	# source package descriptions, sets variables for this script
 	# and executes whatever is needed to build the package
 
diff --git a/i486-stage1/binutils/DESCR b/i486-stage1/binutils/DESCR
new file mode 100644
index 0000000..cfb98d7
--- /dev/null
+++ b/i486-stage1/binutils/DESCR
@@ -0,0 +1,8 @@
+# prepare configure for cross-compilation
+sed -i "/--prefix=\/usr/ a \     --host=$TARGET_ARCH --build=$BUILD_ARCH \\\\" PKGBUILD
+
+# TODO: this should work with glibc-shim providing glibc, but doesn't?
+sed -i "/depends=/s/glibc/glibc-shim/" PKGBUILD
+
+# git is still there as build dependency, not needed
+sed -i "/makedepends=/s/git//" PKGBUILD
diff --git a/i486-stage1/fakeroot/DESCR b/i486-stage1/fakeroot/DESCR
new file mode 100644
index 0000000..8557ab8
--- /dev/null
+++ b/i486-stage1/fakeroot/DESCR
@@ -0,0 +1,11 @@
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+
+# disable makedepends and take out po4a
+sed -i "/makedepends=/s/po4a//" PKGBUILD
+sed -i 's@\(cd doc\)@#\1@g' PKGBUILD
+sed -i 's@\(po4a\)@#\1@g' PKGBUILD
+
+# we have no ld.so.conf, so we can ignore this:
+#/tmp/alpm_va2bmk/.INSTALL: line 2: usr/bin/ldconfig: No such file or directory
+#error: command failed to execute correctly
diff --git a/i486-stage1/gawk/DESCR b/i486-stage1/gawk/DESCR
new file mode 100644
index 0000000..c3b63cf
--- /dev/null
+++ b/i486-stage1/gawk/DESCR
@@ -0,0 +1,5 @@
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+
+# we don't have a valid locale yet, disable NLS
+sed -i 's@./configure@./configure --disable-nls@g' PKGBUILD
diff --git a/i486-stage1/gcc/DESCR b/i486-stage1/gcc/DESCR
new file mode 100644
index 0000000..4947ec8
--- /dev/null
+++ b/i486-stage1/gcc/DESCR
@@ -0,0 +1,42 @@
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+
+# TODO from here: make it all patches, once  our own PKGBUILD works
+
+# gcc
+#sed -i '/--prefix=\/usr/ a \     --target=i486-unknown-linux-gnu --build=x86_64-pc-linux-gnu \\' gcc/PKGBUILD
+# no doxygen documentation
+#sed -i "/makedepends=/s/doxygen//" gcc/PKGBUILD
+# no ADA
+#sed -i "/makedepends=/s/gcc-ada//" gcc/PKGBUILD
+#sed -i '/pkgname/ s/gcc-ada//g' gcc/PKGBUILD
+#sed -i '/enable-languages/ s/ada//g' gcc/PKGBUILD
+# do not build git versions or from git!
+#sed -i 's/pkgver=7.2.1/pkgver=7.2.0/' gcc/PKGBUILD
+#sed -i "/makedepends=/s/git//" gcc/PKGBUILD
+#sed -i 's@git+https://gcc.gnu.org/git/gcc.git#commit=${_commit}@https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz@g' gcc/PKGBUILD
+#sed -i 's@cd gcc$@cd ${pkgname}-${pkgver}@g' gcc/PKGBUILD
+#sed -i 's@$srcdir/gcc/configure@$srcdir/${pkgname}-${pkgver}/configure@g' gcc/PKGBUILD
+# send bugs to the right place
+#sed -i 's@https://bugs.archlinux.org/@https://bugs.archlinux32.org/@g' gcc/PKGBUILD
+# no LTO and plugins, they break and we don't need them
+#sed -i 's@--enable-plugin@--disable-plugin@' gcc/PKGBUILD
+#sed -i 's@--enable-lto@--disable-lto@' gcc/PKGBUILD
+#sed -i '/enable-languages/ s/lto,//g' gcc/PKGBUILD
+# no other languages (Fortran, go, objc, etc)
+#sed -i '/pkgname/ s/gcc-fortran//g' gcc/PKGBUILD
+#sed -i '/enable-languages/ s/,fortran//g' gcc/PKGBUILD
+#sed -i '/pkgname/ s/gcc-go//g' gcc/PKGBUILD
+#sed -i '/enable-languages/ s/go,//g' gcc/PKGBUILD
+#sed -i '/pkgname/ s/gcc-objc//g' gcc/PKGBUILD
+#sed -i '/enable-languages/ s/objc,//g' gcc/PKGBUILD
+#sed -i '/enable-languages/ s/,obj-c++//g' gcc/PKGBUILD
+# disable some libraries (libgomp doesn't cross compile, NLS we don't need)
+#sed -i "/--disable-libssp/ a \      --disable-libgomp \\" gcc/PKGBUILD
+#sed -i "/--disable-libssp/ a \      --disable-nls \\" gcc/PKGBUILD
+# disable threads
+#sed -i 's@--enable-threads=posix@--disable-threads@' gcc/PKGBUILD
+#=> current use PKGBUILD-gcc-cross, sorry, too many changes!
+# disable all languages but C and C++
+#use gcc-cross-PKGBUILD
+
diff --git a/i486-stage1/gcc/PKGBUILD b/i486-stage1/gcc/PKGBUILD
new file mode 100644
index 0000000..9280f4f
--- /dev/null
+++ b/i486-stage1/gcc/PKGBUILD
@@ -0,0 +1,414 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgname=(gcc gcc-libs     lib32-gcc-libs)
+pkgver=7.2.0
+_pkgver=${pkgver:0:1}
+_islver=0.18
+pkgrel=2
+pkgdesc='The GNU Compiler Collection'
+arch=(i486 x86_64)
+license=(GPL LGPL FDL custom)
+url='http://gcc.gnu.org'
+makedepends=(binutils libmpc    lib32-glibc)
+checkdepends=(dejagnu inetutils)
+options=(!emptydirs)
+_commit=bce1ab0478f96724828df51ccfd43197d917c572
+source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
+        c89 c99)
+md5sums=('SKIP'
+         '11436d6b205e516635b666090b94ab32'
+         '3d333df77302ed89e06a4a8539943b7d'
+         'da96f545b863e57c6ab2598c1ea9a740')
+
+_libdir=usr/lib/gcc/$CHOST/$pkgver
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # link isl for in-tree build
+  ln -s ../isl-${_islver} isl
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  # Arch Linux installs x86_64 libraries /lib
+  sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+  mkdir -p "$srcdir/gcc-build"
+}
+
+build() {
+  cd gcc-build
+
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
+
+  "$srcdir/${pkgname}-${pkgver}/configure" --prefix=/usr \
+      --disable-bootstrap \
+      --target=i486-unknown-linux-gnu --host=i486-unknown-linux-gnu --build=x86_64-pc-linux-gnu \
+      --libdir=/usr/lib \
+      --libexecdir=/usr/lib \
+      --mandir=/usr/share/man \
+      --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux32.org/ \
+      --enable-languages=c,c++ \
+      --enable-shared \
+      --disable-threads \
+      --disable-libitm \
+      --disable-libatomic \
+      --disable-libcilkrts \
+      --enable-libmpx \
+      --with-system-zlib \
+      --with-isl \
+      --enable-__cxa_atexit \
+      --disable-libunwind-exceptions \
+      --enable-clocale=gnu \
+      --disable-libstdcxx-pch \
+      --disable-libssp \
+      --disable-nls \
+      --disable-libgomp \
+      --enable-gnu-unique-object \
+      --enable-linker-build-id \
+      --disable-lto \
+      --disable-plugin \
+      --enable-install-libiberty \
+      --with-linker-hash-style=gnu \
+      --enable-gnu-indirect-function \
+      --disable-multilib \
+      --disable-werror \
+      --enable-checking=release \
+      --enable-default-pie \
+      --enable-default-ssp
+
+  make
+
+  # make documentation
+  make -C $CHOST/libstdc++-v3/doc doc-man-doxygen
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  "$srcdir/gcc/contrib/test_summary"
+}
+
+package_gcc-libs() {
+  pkgdesc='Runtime libraries shipped by GCC'
+  groups=(base)
+  depends=('glibc>=2.26')
+  options+=(!strip)
+  provides=($pkgname-multilib)
+  replaces=($pkgname-multilib)
+
+  cd gcc-build
+  make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
+  rm -f "$pkgdir/$_libdir/libgcc_eh.a"
+
+  for lib in \
+              \
+              \
+              \
+              \
+              \
+             libsanitizer/{a,l,ub,t}san \
+             libstdc++-v3/src \
+             ; do
+    make -C $CHOST/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
+  done
+
+#  make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
+  make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
+#  make -C $CHOST/libmpx DESTDIR="$pkgdir" install
+#  rm -f "$pkgdir/usr/lib/libmpx.spec"
+
+  # remove files provided by lib32-gcc-libs
+#  rm -rf "$pkgdir"/usr/lib32/
+
+  # Install Runtime Library Exception
+#  install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
+#    "$pkgdir/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
+}
+
+package_gcc() {
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
+  groups=('base-devel')
+  optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
+  provides=($pkgname-multilib)
+  replaces=($pkgname-multilib)
+  options+=(staticlibs)
+
+  cd gcc-build
+
+  make -C gcc DESTDIR="$pkgdir" install-driver install-cpp install-gcc-ar \
+    c++.install-common install-headers install-plugin 
+
+  install -m755 -t "$pkgdir/usr/bin/" gcc/gcov{,-tool}
+  install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2}
+
+  make -C $CHOST/libgcc DESTDIR="$pkgdir" install
+  make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install
+  rm -f "$pkgdir"/usr/lib{,32}/libgcc_s.so*
+
+  make -C $CHOST/libstdc++-v3/src DESTDIR="$pkgdir" install
+  make -C $CHOST/libstdc++-v3/include DESTDIR="$pkgdir" install
+  make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
+  make -C $CHOST/libstdc++-v3/python DESTDIR="$pkgdir" install
+  make -C $CHOST/32/libstdc++-v3/src DESTDIR="$pkgdir" install
+  make -C $CHOST/32/libstdc++-v3/include DESTDIR="$pkgdir" install
+  make -C $CHOST/32/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
+
+  make DESTDIR="$pkgdir" install-libcc1
+  install -d "$pkgdir/usr/share/gdb/auto-load/usr/lib"
+  mv "$pkgdir"/usr/lib/libstdc++.so.6.*-gdb.py \
+    "$pkgdir/usr/share/gdb/auto-load/usr/lib/"
+  rm "$pkgdir"/usr/lib{,32}/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 /usr/lib/gcc/$CHOST/$pkgver/liblto_plugin.so \
+  #  "$pkgdir/usr/lib/bfd-plugins/"
+
+  #make -C $CHOST/libcilkrts DESTDIR="$pkgdir" install-nodist_{toolexeclib,cilkinclude}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/32/libcilkrts DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
+  #make -C $CHOST/32/libgomp DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
+  #make -C $CHOST/32/libitm DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
+  #make -C $CHOST/32/libsanitizer DESTDIR="$pkgdir" install-nodist_{saninclude,toolexeclib}HEADERS
+  #make -C $CHOST/32/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
+  #make -C $CHOST/32/libmpx DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
+
+  make -C libiberty DESTDIR="$pkgdir" install
+  install -m644 libiberty/pic/libiberty.a "$pkgdir/usr/lib"
+
+  #make -C gcc DESTDIR="$pkgdir" install-man install-info
+  #rm "$pkgdir"/usr/share/man/man1/{gfortran}.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 "$pkgdir"/usr/bin/cc
+
+  # POSIX conformance launcher scripts for c89 and c99
+  install -Dm755 "$srcdir/c89" "$pkgdir/usr/bin/c89"
+  install -Dm755 "$srcdir/c99" "$pkgdir/usr/bin/c99"
+
+  # install the libstdc++ man pages
+  #make -C $CHOST/libstdc++-v3/doc DESTDIR="$pkgdir" doc-install-man
+
+  # remove files provided by lib32-gcc-libs
+  #rm -f "$pkgdir"/usr/lib32/lib{stdc++,gcc_s}.so
+
+  # Install Runtime Library Exception
+  #install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  #ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+  #  "$pkgdir/usr/share/licenses/$pkgname/"
+}
+
+package_gcc-fortran() {
+  pkgdesc='Fortran front-end for GCC'
+  depends=("gcc=$pkgver-$pkgrel")
+  provides=($pkgname-multilib)
+  replaces=($pkgname-multilib)
+
+  cd gcc-build
+  make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
+    install-{toolexeclibDATA,nodist_fincludeHEADERS}
+  make -C $CHOST/32/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,man,info}
+  install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
+
+  ln -s gfortran "$pkgdir/usr/bin/f95"
+
+  # Install Runtime Library Exception
+  #install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  #ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+  #  "$pkgdir/usr/share/licenses/$pkgname/"
+}
+
+package_gcc-objc() {
+  pkgdesc='Objective-C front-end for GCC'
+  depends=("gcc=$pkgver-$pkgrel")
+  provides=($pkgname-multilib)
+  replaces=($pkgname-multilib)
+
+  cd gcc-build
+  make DESTDIR="$pkgdir" -C $CHOST/libobjc install-headers
+  install -dm755 "$pkgdir/${_libdir}"
+  install -m755 gcc/cc1obj{,plus} "$pkgdir/${_libdir}/"
+
+  # Install Runtime Library Exception
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
+}
+
+package_gcc-ada() {
+  pkgdesc='Ada front-end for GCC (GNAT)'
+  depends=("gcc=$pkgver-$pkgrel")
+  provides=($pkgname-multilib)
+  replaces=($pkgname-multilib)
+  options+=(staticlibs)
+
+  cd gcc-build/gcc
+  make DESTDIR="$pkgdir" ada.install-{common,info}
+  install -m755 gnat1 "$pkgdir/${_libdir}"
+
+  cd "$srcdir"/gcc-build/$CHOST/32/libada
+  make DESTDIR=${pkgdir} INSTALL="install" \
+    INSTALL_DATA="install -m644" install-gnatlib
+
+  ln -s gcc "$pkgdir/usr/bin/gnatgcc"
+
+  # insist on dynamic linking, but keep static libraries because gnatmake complains
+  mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_pkgver}.so "$pkgdir/usr/lib"
+  ln -s libgnarl-${_pkgver}.so "$pkgdir/usr/lib/libgnarl.so"
+  ln -s libgnat-${_pkgver}.so "$pkgdir/usr/lib/libgnat.so"
+  rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
+
+  install -d "$pkgdir/usr/lib32/"
+  mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_pkgver}.so "$pkgdir/usr/lib32"
+  ln -s libgnarl-${_pkgver}.so "$pkgdir/usr/lib32/libgnarl.so"
+  ln -s libgnat-${_pkgver}.so "$pkgdir/usr/lib32/libgnat.so"
+  rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
+
+  # Install Runtime Library Exception
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
+}
+
+package_gcc-go() {
+  pkgdesc='Go front-end for GCC'
+  depends=("gcc=$pkgver-$pkgrel")
+  provides=("go=1.8.1" $pkgname-multilib)
+  replaces=($pkgname-multilib)
+  conflicts=(go)
+
+  cd gcc-build
+  make -C $CHOST/libgo DESTDIR="$pkgdir" install-exec-am
+  make -C $CHOST/32/libgo DESTDIR="$pkgdir" install-exec-am
+  make DESTDIR="$pkgdir" install-gotools
+  make -C gcc DESTDIR="$pkgdir" go.install-{common,man,info}
+
+  rm -f "$pkgdir"/usr/lib{,32}/libgo.so*
+  install -Dm755 gcc/go1 "$pkgdir/${_libdir}/go1"
+
+  # Install Runtime Library Exception
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
+}
+
+package_lib32-gcc-libs() {
+  pkgdesc='32-bit runtime libraries shipped by GCC'
+  depends=('lib32-glibc>=2.26')
+  groups=(multilib-devel)
+  options=(!emptydirs !strip)
+
+  cd gcc-build
+
+  make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install-shared
+  rm -f "$pkgdir/$_libdir/32/libgcc_eh.a"
+
+  for lib in \
+             libgfortran \
+             libgo \
+             libsanitizer/{a,l,ub}san \
+             libstdc++-v3/src \
+             ; do
+    make -C $CHOST/32/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
+  done
+
+#  make -C $CHOST/32/libobjc DESTDIR="$pkgdir" install-libs
+#  make -C $CHOST/32/libmpx DESTDIR="$pkgdir" install
+#  rm -f "$pkgdir/usr/lib32/libmpx.spec"
+
+  # remove files provided by gcc-libs
+  rm -rf "$pkgdir"/usr/lib
+
+  # Install Runtime Library Exception
+#  install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
+#    "$pkgdir/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
+}
+
+makedepends=(
+  $(
+    printf '%s\n' "${makedepends[@]}" | \
+      grep -v '^lib32-glibc\($\|[<>=]\)'
+  )
+)
+pkgname=(
+  $(
+    printf '%s\n' "${pkgname[@]}" | \
+      grep -vFx 'lib32-gcc-libs'
+  )
+)
+unset -f 'package_lib32-gcc-libs'
+eval "$(
+  declare -f prepare | \
+    sed '
+      \,/s/lib64/lib/, d
+    '
+  declare -f build | \
+    sed '
+      s/--enable-multilib/--disable-multilib/
+    '
+  declare -f package_gcc-libs | \
+    sed '
+      s/\$pkgname-multilib//
+      s@libsanitizer/{a,l,ub,t}san@libsanitizer/{a,l,ub}san@
+      \@/usr/lib32/@ d
+    '
+  declare -f package_gcc | \
+    sed '
+      s/"lib32-gcc-libs[^"]*"//g
+    '
+  declare -f package_gcc-ada | \
+    sed '
+      \,cd .*/32/libada,{
+        N
+        d
+      }
+    '
+)"
+eval "$(
+  for name in "${pkgname[@]}"; do
+    declare -f package_${name} | \
+      sed '
+        s/$pkgname-multilib//
+        s/{,32}//
+        \,/lib32/,d
+        \,/32/,d
+      '
+  done
+)"
diff --git a/i486-stage1/libmpc/DESCR b/i486-stage1/libmpc/DESCR
new file mode 100644
index 0000000..b7ba8bd
--- /dev/null
+++ b/i486-stage1/libmpc/DESCR
@@ -0,0 +1,6 @@
+# mpc is needed by gcc
+SYSROOT_INSTALL=1
+
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+
diff --git a/i486-stage1/make/DESCR b/i486-stage1/make/DESCR
new file mode 100644
index 0000000..e72d655
--- /dev/null
+++ b/i486-stage1/make/DESCR
@@ -0,0 +1,6 @@
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+
+# no guile
+sed -i "/depends=/s/'guile'//" PKGBUILD
+sed -i 's@./configure@./configure --without-guile@g' PKGBUILD
diff --git a/i486-stage1/mpfr/DESCR b/i486-stage1/mpfr/DESCR
new file mode 100644
index 0000000..f098886
--- /dev/null
+++ b/i486-stage1/mpfr/DESCR
@@ -0,0 +1,5 @@
+# mpc is needed by gcc
+SYSROOT_INSTALL=1
+
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD