finished stage2 (but for syslinux)

5 files changed, 514 insertions, 154 deletions

diff --git a/.Attic/README.old_stage2 b/.Attic/README.old_stage2
index 5b3becf..6e7fc69 100644
--- a/.Attic/README.old_stage2
+++ b/.Attic/README.old_stage2
@@ -39,157 +39,6 @@ sed -i '/configure.ac/ a \  sed -i "s@\\(unit_SOURCES.*\\)@#\\1@g" Makefile.am'
 sed -i '/configure.ac/ a \  sed -i "s@\\(check_PROGRAMS*\\)@#\\1@g" Makefile.am' dejagnu/PKGBUILD
 sed -i '/Makefile.am/ a \  autoreconf' dejagnu/PKGBUILD
 
-# TODO: gcc
-#####
-TODO:
-sed -i 's@^makedepends\(.*\)@#makedepends\1@g' binutils/PKGBUILD
-sed -i 's@^checkdepends\(.*\)@#checkdepends\1@g' binutils/PKGBUILD
-sed -i 's@^depends\(.*\)@#depends\1@g' binutils/PKGBUILD
-
-# gcc
-#####
-# no gcc-ada and doxygen
-sed -i '/makedepend/ s/gcc-ada //g' gcc/PKGBUILD
-sed -i '/makedepend/ s/doxygen //g' gcc/PKGBUILD
-# avoid huge git checkouts
-sed -i 's@git+https://gcc.gnu.org/git/gcc.git.*@ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz@' 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
-# we don't have a working C++ compiler right now, be must bootstrap
-# doesn't work, we need c++ sind 4.8!
-#sed -i '/--enable-shared/ a \      --enable-bootstrap \\' gcc/PKGBUILD
-# remove ADA, we don't have (and will most likely never have a GNAT binary to
-# bootstrap ADA itself), on the other hand, there is nothing using ADA anyway.
-# at least not in packages/community
-sed -i '/pkgname/ s/gcc-ada//g' gcc/PKGBUILD
-sed -i '/enable-languages/ s/ada//g' gcc/PKGBUILD
-# send bugs to the right place
-sed -i 's@https://bugs.archlinux.org/@https://bugs.archlinux32.org/@g' gcc/PKGBUILD
-# so, I don't know what GNU people call bootstrapping, but this definitely isn't for C!
-/usr/include/c++/7.2.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
-=> let's try to fix the C++ compiler then..
-# this is really really dangerous, let's hope, it works
-=> find /usr/include/c++/7.2.0 -type f -exec sed -i 's/#include_next/#include/g' {} \;
-# /build/gcc/src/gcc-7.2.0/libgo/testsuite/gotest: line 624: 28445 Killed                  ./a.out -test.short -test.timeout=${timeout}s "$@"
-=> ok, enough, go without testing
-==> Starting package_gcc-go()...
-make: *** i486-pc-linux-gnu/libgo: No such file or directory.  Stop.
-==> ERROR: A failure occurred in package_gcc-go().
-    Aborting...
-=> fails, oh well, nobody needs go :-)
-
-
-why the hell, I switched off c++, so wy are still cpp probes being done!?
-/lib/cpp hardcoded, seriosly!!
-# in prepare()
-ln -s ../bin/cpp /home/cross/x-tools/i486-unknown-linux-gnu/lib/cpp
-find . -name configure -exec sed -i 's@/lib/cpp@/home/cross/x-tools/i486-unknown-linux-gnu/bin/cpp@g' {} \;
-
-since 4.8 gcc is written in C++, fine. so we have to have a crosstool-ng C++ or
-=> we add C++ to the crosstool-ng toolchain, easier and more secure
-
- included from /home/cross/build/gcc/src/gcc-7.2.0/gcc/genmddeps.c:19:0:
-/home/cross/build/gcc/src/gcc-7.2.0/gcc/system.h:540:34: error: declaration of C function ‘const cha
-r* strsignal(int)’ conflicts with
- extern const char *strsignal (int);
-                                  ^
-In file included from /usr/include/c++/4.8.2/cstring:42:0,
-                 from /home/cross/build/gcc/src/gcc-7.2.0/gcc/system.h:235,
-                 from /home/cross/build/gcc/src/gcc-7.2.0/gcc/genmddeps.c:19:
-/usr/include/string.h:562:14: error: previous declaration ‘char* strsignal(int)’ here
- extern char *strsignal (int __sig) __THROW;             ^
-In file included from ./bconfig.h:5:0,
-=> so, we get to an end here, c++ is taken from the host while cross-compiling?!
--> remove glibc-devel on the host!
--> draw the g++ link, autoconf fails in gcc in funny ways (not finding uint64_t)
--> carefull, we build a gcc over a crossng-gcc, not sure, this is supported..
--> aha. if mpfr, mpc and gmp are not installed and taken from sysroot but from i486-root
-   some pathes get messed up.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82590
-https://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg550065.html
-https://gcc.gnu.org/bugzilla/show_bug.cgi?format=multiple&id=54692
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65863
--> huh?
-https://gcc.gnu.org/ml/gcc-help/2016-06/msg00016.html
-- > yes, this is the inicatition I needed, mpfr, gmp and mpc point to a weird location
-
-The stage one compiler doesn't find the shared library, o well:
-/home/cross/build/gcc/src/gcc-build/./gcc/cc1: error while loading shared libraries: libmpc.so.3: cannot open shared object file: No such file or directory
--> export LD_LIBRARY_PATH=/home/cross/x-tools/i486-unknown-linux-gnu/i486-unknown-linux-gnu/sysroot/usr/lib
-
-And it never ends:
-In file included from /home/cross/build/gcc/src/gcc-7.2.0/libgcc/libgcc2.c:27:0:
-/home/cross/build/gcc/src/gcc-7.2.0/libgcc/../gcc/tsystem.h:87:10: fatal error: stdio.h: No such file or directory
- #include <stdio.h>
-          ^~~~~~~~~
-compilation terminated.
-make[2]: *** [Makefile:491: _muldi3.o] Error 1
--> https://gcc.gnu.org/ml/gcc-help/2012-04/msg00088.html
--> so, let's try giving it a --with-sysroot to the crosstool-ng dirs
--> and this means also it got past stage 1 compilers :-)
-
-/home/cross/x-tools/i486-unknown-linux-gnu/lib/gcc/i486-unknown-linux-gnu/4.9.4/../../../../i486-unknown-linux-gnu/bin/ld: /home/cross/build/gcc/src/gcc-build/./gcc/liblto_plugin.so: error loading plugin: /home/cross/build/gcc/src/gcc-build/./gcc/liblto_plugin.so: wrong ELF class: ELFCLASS32
-collect2: error: ld returned 1 exit status
-make[2]: *** [Makefile:982: libgcc_s.so] Error 1
-=> for now, remove LTO stuff in PKGBUILD
-
-make: *** i486-unknown-linux-gnu/libstdc++-v3/doc: No such file or directory.  Stop.
-==> ERROR: A failure occurred in build().
-    Aborting...
-=> remove the PKGBUILD line #  make -C $CHOST/libstdc++-v3/doc DESTDIR="$pkgdir" doc-install-man
-libstdc++-v3/
-=> # make documentation
-  #make -C $CHOST/libstdc++-v3/doc doc-man-doxygen
-
-install: failed to access ‘/home/cross/build/gcc/pkg/gcc/usr/lib/gcc/i486-unknown-linux-gnu/7.2.0/’: No such file or directory
-=> gcc auto-probed itself into i486-pc-linux-gnu, so the installed files are there
-CHOST="i486-pc-linux-gnu"    
-make: Leaving directory '/home/cross/build/gcc/src/gcc-build/gcc'
-install: failed to access ‘/home/cross/build/gcc/pkg/gcc/usr/lib/gcc/i486-unknown-linux-gnu/7.2.0/’: No such file or directory
-=> sweet, let's try a symlink
-
-_libdir=usr/lib/gcc/$CHOST/$pkgver
-=> hard-code: to _libdir=usr/lib/gcc/i486-pc-linux-gnu/$pkgver
-=> nope, now others break
-this is hardly the ArchLinux way: vanilla and upstream
-
-again CHOST set to  i486-pc-linux-gnu
-=> this package is a disaster!
-=> we have a mess with two CHOSTS, one for crosstool-ng (unknown) and
-   one for our chroot
-
-# remove traces of ADA
-  rm "$pkgdir"/usr/share/info/{gccgo,gfortran.info}
-
-# rm: cannot remove ‘/home/cross/build/gcc/pkg/gcc/usr/share/info/gccgo’: No such file or directory
-#  rm "$pkgdir"/usr/share/info/{gccgo,gfortran.info}
-
-/home/cross/x-tools/i486-unknown-linux-gnu/lib/gcc/i486-unknown-linux-gnu/4.9.4/../../../../i486-unknown-linux-gnu/bin/ld: cannot find -lquadmath
-collect2: error: ld returned 1 exit status
-libtool: install: error: relink `libgfortran.la' with the above command before installing it
-make: *** [Makefile:1331: install-toolexeclibLTLIBRARIES] Error 1
-make: Leaving directory '/home/cross/build/gcc/src/gcc-build/i486-unknown-linux-gnu/libgfortran'
-==> ERROR: A failure occurred in package_gcc-libs().
-    Aborting...
-=> libquadmath must be retooled before libfortran
-=> nope libfortran simply fails to relink => remove it
-
-install: cannot stat ‘/home/cross/build/gcc/src/gcc/COPYING.RUNTIME’: No such file or directory
-=> sweet, remove it
-
-error: failed to commit transaction (conflicting files)
-gcc: /home/cross/i486-root/usr/lib/libstdc++.a exists in filesystem (owned by gcc-libs)
-gcc: /home/cross/i486-root/usr/lib/libstdc++.la exists in filesystem (owned by gcc-libs)
-Errors occurred, no packages were upgraded.
-=> well, force the package
-
-test.c:1:10: fatal error: stdio.h: No such file or directory
-
-
-# END TODO: gcc
-
 # glibc
 #######
 # use 2.25 version, not 2.26. Keep the ABI intact!
diff --git a/build_stage2.sh b/build_stage2.sh
index c3465b3..e435fac 100755
--- a/build_stage2.sh
+++ b/build_stage2.sh
@@ -31,12 +31,10 @@ kbd procps-ng bison shadow
 inetutils bc kmod linux uinit nasm 
 net-tools libmnl libnfnetlink iptables iproute2
 libedit openssh
-make mpfr gawk libmpc binutils
+make mpfr gawk libmpc binutils gcc glibc
 libunwind strace gdb
 "
 #TODO after nasm: syslinux
-#~ TODO: after binutils: gcc glibc
-
 
 for p in $PACKAGES; do
 	"$SCRIPT_DIR/build_stage2_package.sh" "$p" || exit 1
diff --git a/i486-stage2/gcc/DESCR b/i486-stage2/gcc/DESCR
new file mode 100644
index 0000000..a3bf8e7
--- /dev/null
+++ b/i486-stage2/gcc/DESCR
@@ -0,0 +1,67 @@
+# TODO: how to make this a hook for the stage1 builder?
+# aftermatch for gcc/binutils
+#collect2: unable to find ld
+#=> this is the cross compiled gcc for i486 inside the chroot, it expects
+#   its platform dependend stuff in /usr/lib/gcc/i486-unknown-linux-gnu/7.2.0
+#=> we can temporarily fix this:
+#sudo ln -s /usr/bin/ld $STAGE1_CHROOT/usr/lib/gcc/i486-unknown-linux-gnu/7.2.0/ld
+
+
+# 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
+
+# more TODOs:
+#rm "$pkgdir"/usr/share/info/{gccgo,gfortran.info}
+# rm: cannot remove ???/home/cross/build/gcc/pkg/gcc/usr/share/info/gccgo???: No such file or directory
+#  rm "$pkgdir"/usr/share/info/{gccgo,gfortran.info}
+#https://bugs.archlinux.org/task/57421
+#/home/cross/x-tools/i486-unknown-linux-gnu/lib/gcc/i486-unknown-linux-gnu/4.9.4/../../../../i486-unknown-linux-gnu/bin/ld: cannot find -lquadmath
+#collect2: error: ld returned 1 exit status
+#libtool: install: error: relink `libgfortran.la' with the above command before installing it
+#make: *** [Makefile:1331: install-toolexeclibLTLIBRARIES] Error 1
+#make: Leaving directory '/home/cross/build/gcc/src/gcc-build/i486-unknown-linux-gnu/libgfortran'
+#==> ERROR: A failure occurred in package_gcc-libs().
+#    Aborting...
+#=> libquadmath must be retooled before libfortran
+#=> nope libfortran simply fails to relink => remove it
+#
+#install: cannot stat ???/home/cross/build/gcc/src/gcc/COPYING.RUNTIME???: No such file or directory
+#=> sweet, remove it
+#
+#test.c:1:10: fatal error: stdio.h: No such file or directory
diff --git a/i486-stage2/gcc/PKGBUILD b/i486-stage2/gcc/PKGBUILD
new file mode 100644
index 0000000..3e0f92b
--- /dev/null
+++ b/i486-stage2/gcc/PKGBUILD
@@ -0,0 +1,435 @@
+# $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.3.0
+_majorver=${pkgver:0:1}
+_islver=0.18
+pkgrel=1
+pkgdesc='The GNU Compiler Collection'
+arch=(i486 x86_64)
+license=(GPL LGPL FDL custom)
+url='http://gcc.gnu.org'
+makedepends=(binutils libmpc)
+checkdepends=(dejagnu inetutils)
+options=(!emptydirs)
+#source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
+source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
+        c89 c99)
+validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
+              13975A70E63C361C73AE69EF6EEB81F8981C74C7) # richard.guenther@gmail.com
+sha256sums=('832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c'
+            'SKIP'
+            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
+            'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
+            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
+
+_svnrev=256757
+_svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
+_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
+
+snapshot() {
+  svn export -r${_svnrev} ${_svnurl} gcc-r${_svnrev}
+
+  local datestamp basever _pkgver
+  basever=$(< gcc-r${_svnrev}/gcc/BASE-VER)
+  datestamp=$(< gcc-r${_svnrev}/gcc/DATESTAMP)
+  _pkgver=${basever}-${datestamp}
+
+  mv gcc-r${_svnrev} gcc-${_pkgver}
+  tar cf - gcc-${_pkgver} | xz > gcc-${_pkgver}.tar.xz
+  gpg -b gcc-${_pkgver}.tar.xz
+  scp gcc-${_pkgver}.tar.xz{,.sig} sources.archlinux.org:/srv/ftp/other/gcc/
+
+  echo
+  echo "pkgver=${_pkgver/-/+}"
+}
+
+prepare() {
+  ln -s gcc-${pkgver/+/-} gcc
+  cd gcc
+
+  # 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 \
+      --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
+
+  # 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/"
+  
+  #collect2: unable to find ld
+  ln -s /usr/bin/ld $pkgdir/usr/lib/gcc/i486-pc-linux-gnu/$pkgver/ld
+}
+
+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}-${_majorver}.so "$pkgdir/usr/lib"
+  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib/libgnarl.so"
+  ln -s libgnat-${_majorver}.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}-${_majorver}.so "$pkgdir/usr/lib32"
+  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib32/libgnarl.so"
+  ln -s libgnat-${_majorver}.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-stage2/glibc/DESCR b/i486-stage2/glibc/DESCR
new file mode 100644
index 0000000..2c90931
--- /dev/null
+++ b/i486-stage2/glibc/DESCR
@@ -0,0 +1,11 @@
+# disable multilib, we are on 32-bit only
+sed -i 's@--enable-multi-arch@--disable-multi-arch@g' PKGBUILD
+sed -i "/makedepends=/s/lib32-gcc-libs//g" PKGBUILD
+sed -i "/pkgname/s/lib32-glibc//g" PKGBUILD
+
+# change bug reporting
+sed -i 's@https://bugs.archlinux.org/@https://bugs.archlinux32.org/@g' PKGBUILD
+
+# no gd for memory profiles
+sed -i "/makedepends=/s/gd//" PKGBUILD
+