130 files changed, 734 insertions, 357 deletions
diff --git a/src/stage4/makepkg.sh b/src/stage4/makepkg.sh
index 1df4f23..4109941 100644
--- a/src/stage4/makepkg.sh
+++ b/src/stage4/makepkg.sh
@@ -55,8 +55,8 @@ EOF
   cat >> "$BUILDDIR"/config/makepkg.conf << EOF
 CARCH="$CARCH"
 CHOST="$CHOST"
-CFLAGS="-march=$GCC_MARCH -mabi=$GCC_MABI -O2 -pipe -fstack-protector-strong -fno-plt"
-CXXFLAGS="-march=$GCC_MARCH -mabi=$GCC_MABI -O2 -pipe -fstack-protector-strong -fno-plt"
+CFLAGS="${PLATFORM_CFLAGS[*]} -O2 -pipe -fstack-protector-strong -fno-plt"
+CXXFLAGS="${PLATFORM_CFLAGS[*]} -O2 -pipe -fstack-protector-strong -fno-plt"
 MAKEFLAGS="-j$(($(nproc) + 1))"
 EOF
 
@@ -67,8 +67,8 @@ EOF
   done
 
   # patch libremakepkg to update config.sub/config.guess
-  cat "$(which libremakepkg)" > "$BUILDDIR/libremakepkg-$CARCH.sh"
-  chmod +x "$BUILDDIR/libremakepkg-$CARCH.sh"
+  cat "$(which libremakepkg)" > "$BUILDDIR/libremakepkg.sh"
+  chmod +x "$BUILDDIR/libremakepkg.sh"
 
   if [ "x${REGEN_CONFIG_FRAGMENTS:-no}" == "xyes" ]; then
 	  local url="https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain"
@@ -77,9 +77,9 @@ update_config_fragments() {\\
 	find \$1/build -iname 'config*.sub' -print -exec curl \"$url;f=config.sub;hb=HEAD\" -o {} \\\\;\\
 	find \$1/build -iname 'config*.guess' -print -exec curl \"$url;f=config.guess;hb=HEAD\" -o {} \\\\;\\
 }\\
-hook_pre_build+=(update_config_fragments)" "$BUILDDIR/libremakepkg-$CARCH.sh"
+hook_pre_build+=(update_config_fragments)" "$BUILDDIR/libremakepkg.sh"
   fi
 
   # patch libremakepkg to disable checks
-  sed -i 's/makepkg_args=(.*noconfirm[^)]*/& --nocheck/' "$BUILDDIR/libremakepkg-$CARCH.sh"
+  sed -i 's/makepkg_args=(.*noconfirm[^)]*/& --nocheck/' "$BUILDDIR/libremakepkg.sh"
 }
diff --git a/src/stage4/patches/binutils.patch b/src/stage4/patches/binutils.patch
deleted file mode 100644
index 7885c35..0000000
--- a/src/stage4/patches/binutils.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/PKGBUILD	2018-03-21 23:15:04.617863791 +0100
-+++ b/PKGBUILD	2018-03-22 07:15:46.834768079 +0100
-@@ -4,8 +4,8 @@
- # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
- 
- pkgname=binutils
--pkgver=2.29.1
--pkgrel=3
-+pkgver=2.30
-+pkgrel=1
- pkgdesc='A set of programs to assemble and manipulate binary and object files'
- arch=(x86_64)
- url='http://www.gnu.org/software/binutils/'
-@@ -19,16 +19,10 @@ replaces=(binutils-multilib)
- options=(staticlibs !distcc !ccache)
- #_commit=d1a6e7195b9bb0255fa77588985b969ad8aaacf5
- #source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit}
--source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig}
--        0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch
--        0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch
--        0001-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch)
-+source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig})
- validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
--md5sums=('acc9cd826edb9954ac7cecb81c727793'
--         'SKIP'
--         'e4be936139ef46122cb3841881c432b2'
--         '469164f3c93a0e92a697537b60c9806c'
--         '0c679b37e90fb23de60a4d28329b956a')
-+md5sums=('ffc476dd46c96f932875d1b2e27e929f'
-+         'SKIP')
- 
- prepare() {
-   mkdir -p binutils-build
-@@ -38,15 +32,6 @@ prepare() {
- 
-   # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
-   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
--
--  # https://bugs.archlinux.org/task/55741
--  git apply ../0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch
--
--  # https://sourceware.org/bugzilla/show_bug.cgi?id=22741
--  git apply ../0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch
--
--  # https://sourceware.org/bugzilla/show_bug.cgi?id=22829
--  git apply ../0001-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch
- }
- 
- build() {
diff --git a/src/stage4/patches/gcc.patch b/src/stage4/patches/gcc.patch
deleted file mode 100644
index d437e21..0000000
--- a/src/stage4/patches/gcc.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-06 04:45:27.275666098 +0200
-+++ b/PKGBUILD	2018-04-06 04:45:27.275666098 +0200
-@@ -5,7 +5,8 @@
- # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
- # NOTE: libtool requires rebuilt with each new gcc version
- 
--pkgname=(gcc gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go lib32-gcc-libs)
-+pkgname=(gcc gcc-libs gcc-fortran)
-+[ "x@MULTILIB@" == "xdisable" ] || pkgname+=(lib32-gcc-libs)
- pkgver=7.3.1+20180312
- _majorver=${pkgver:0:1}
- _islver=0.18
-@@ -14,13 +15,15 @@ pkgdesc='The GNU Compiler Collection'
- arch=(x86_64)
- license=(GPL LGPL FDL custom)
- url='http://gcc.gnu.org'
--makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python)
-+makedepends=(binutils libmpc doxygen python)
-+[ "x@MULTILIB@" == "xdisable" ] || makedepends+=(lib32-glibc lib32-gcc-libs)
- 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
-+        "0001-pthread-reentrant.patch"
-         bz84080.patch)
- validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
-               13975A70E63C361C73AE69EF6EEB81F8981C74C7) # richard.guenther@gmail.com
-@@ -29,6 +32,7 @@ sha256sums=('c52618f656f2102b3544419e7d0
-             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
-             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
-             '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
-+            'fc9c6f0edd615f2b39deff28b9626a08fd98ef8ce19f7e34281c0a5bd653ac3b'
-             'bce05807443558db55f0d6b4dae37a678ea1bb3388b541c876fe3d110e3717e7')
- 
- _svnrev=258469
-@@ -59,6 +63,9 @@ prepare() {
-   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84080
-   patch -p0 -i "$srcdir/bz84080.patch"
- 
-+  # parabola patches
-+  patch -Np1 -i "$srcdir/0001-pthread-reentrant.patch"
-+
-   # link isl for in-tree build
-   ln -s ../isl-${_islver} isl
- 
-@@ -88,10 +95,10 @@ build() {
-       --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-languages=c,c++,fortran,lto \
-       --enable-shared \
-       --enable-threads=posix \
--      --enable-libmpx \
-+      --disable-libmpx \
-       --with-system-zlib \
-       --with-isl \
-       --enable-__cxa_atexit \
-@@ -106,7 +113,7 @@ build() {
-       --enable-install-libiberty \
-       --with-linker-hash-style=gnu \
-       --enable-gnu-indirect-function \
--      --enable-multilib \
-+      --@MULTILIB@-multilib \
-       --disable-werror \
-       --enable-checking=release \
-       --enable-default-pie \
-@@ -131,7 +138,7 @@ package_gcc-libs() {
-   groups=(base)
-   depends=('glibc>=2.26')
-   options+=(!strip)
--  provides=($pkgname-multilib libgo.so libgfortran.so)
-+  provides=($pkgname-multilib libgfortran.so)
-   replaces=($pkgname-multilib)
- 
-   cd gcc-build
-@@ -139,25 +146,17 @@ package_gcc-libs() {
-   rm -f "$pkgdir/$_libdir/libgcc_eh.a"
- 
-   for lib in libatomic \
--             libcilkrts \
-              libgfortran \
--             libgo \
-              libgomp \
--             libitm \
-              libquadmath \
--             libsanitizer/{a,l,ub,t}san \
--             libstdc++-v3/src \
--             libvtv; do
-+             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"
- 
-   for lib in libgomp \
--             libitm \
-              libquadmath; do
-     make -C $CHOST/$lib DESTDIR="$pkgdir" install-info
-   done
-@@ -188,22 +187,22 @@ package_gcc() {
-   install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1}
- 
-   make -C $CHOST/libgcc DESTDIR="$pkgdir" install
--  make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install
-+  [ "x@MULTILIB@" == "xdisable" ] || 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
-+  [ "x@MULTILIB@" == "xdisable" ] || make -C $CHOST/32/libstdc++-v3/src DESTDIR="$pkgdir" install
-+  [ "x@MULTILIB@" == "xdisable" ] || make -C $CHOST/32/libstdc++-v3/include DESTDIR="$pkgdir" install
-+  [ "x@MULTILIB@" == "xdisable" ] || 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*
-+  rm -f "$pkgdir"/usr/lib{,32}/libstdc++.so*
- 
-   make DESTDIR="$pkgdir" install-fixincludes
-   make -C gcc DESTDIR="$pkgdir" install-mkheaders
-@@ -213,26 +212,16 @@ package_gcc() {
-   ln -s /${_libdir}/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
-+  [ "x@MULTILIB@" == "xdisable" ] || make -C $CHOST/32/libgomp 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/{gccgo,gfortran}.1
--  rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
-+  rm -f "$pkgdir"/usr/share/man/man1/{gccgo,gfortran}.1
-+  rm -f "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
- 
-   make -C libcpp DESTDIR="$pkgdir" install
-   make -C gcc DESTDIR="$pkgdir" install-po
-@@ -269,7 +258,7 @@ package_gcc-fortran() {
-   cd gcc-build
-   make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
-     install-{toolexeclibDATA,nodist_fincludeHEADERS}
--  make -C $CHOST/32/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
-+  [ "x@MULTILIB@" == "xdisable" ] || 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}
---- /dev/null	2018-03-21 10:59:45.661284739 +0100
-+++ b/0001-pthread-reentrant.patch	2018-03-22 16:30:51.272498464 +0100
-@@ -0,0 +1,11 @@
-+--- trunk/gcc/config/riscv/linux.h	2018/01/03 10:03:58	256169
-++++ trunk/gcc/config/riscv/linux.h	2018/02/13 11:21:01	257621
-+@@ -47,6 +47,8 @@
-+ 
-+ #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
-+ 
-++#define CPP_SPEC "%{pthread:-D_REENTRANT}"
-++
-+ #define LINK_SPEC "\
-+ -melf" XLEN_SPEC "lriscv \
-+ %{shared} \
diff --git a/src/stage4/patches/aspell.patch b/src/stage4/patches/generic/aspell.patch
index bd45264..bd45264 100644
--- a/src/stage4/patches/aspell.patch
+++ b/src/stage4/patches/generic/aspell.patch
diff --git a/src/stage4/patches/avahi-breakdeps.patch b/src/stage4/patches/generic/avahi-breakdeps.patch
index 0e0ec4b..0e0ec4b 100644
--- a/src/stage4/patches/avahi-breakdeps.patch
+++ b/src/stage4/patches/generic/avahi-breakdeps.patch
diff --git a/src/stage4/patches/avahi.patch b/src/stage4/patches/generic/avahi.patch
index b08d876..b08d876 100644
--- a/src/stage4/patches/avahi.patch
+++ b/src/stage4/patches/generic/avahi.patch
diff --git a/src/stage4/patches/boost.patch b/src/stage4/patches/generic/boost.patch
index da60b61..da60b61 100644
--- a/src/stage4/patches/boost.patch
+++ b/src/stage4/patches/generic/boost.patch
diff --git a/src/stage4/patches/btrfs-progs.patch b/src/stage4/patches/generic/btrfs-progs.patch
index 1c42396..1c42396 100644
--- a/src/stage4/patches/btrfs-progs.patch
+++ b/src/stage4/patches/generic/btrfs-progs.patch
diff --git a/src/stage4/patches/cairo-breakdeps.patch b/src/stage4/patches/generic/cairo-breakdeps.patch
index 7df0bb6..7df0bb6 100644
--- a/src/stage4/patches/cairo-breakdeps.patch
+++ b/src/stage4/patches/generic/cairo-breakdeps.patch
diff --git a/src/stage4/patches/cairo.patch b/src/stage4/patches/generic/cairo.patch
index 51f3685..51f3685 100644
--- a/src/stage4/patches/cairo.patch
+++ b/src/stage4/patches/generic/cairo.patch
diff --git a/src/stage4/patches/colord-breakdeps.patch b/src/stage4/patches/generic/colord-breakdeps.patch
index 0f64440..0f64440 100644
--- a/src/stage4/patches/colord-breakdeps.patch
+++ b/src/stage4/patches/generic/colord-breakdeps.patch
diff --git a/src/stage4/patches/cups-breakdeps.patch b/src/stage4/patches/generic/cups-breakdeps.patch
index 2f339be..2f339be 100644
--- a/src/stage4/patches/cups-breakdeps.patch
+++ b/src/stage4/patches/generic/cups-breakdeps.patch
diff --git a/src/stage4/patches/cups-filters.patch b/src/stage4/patches/generic/cups-filters.patch
index 993c373..993c373 100644
--- a/src/stage4/patches/cups-filters.patch
+++ b/src/stage4/patches/generic/cups-filters.patch
diff --git a/src/stage4/patches/cups.patch b/src/stage4/patches/generic/cups.patch
index 3af99d5..3af99d5 100644
--- a/src/stage4/patches/cups.patch
+++ b/src/stage4/patches/generic/cups.patch
diff --git a/src/stage4/patches/dhcp.patch b/src/stage4/patches/generic/dhcp.patch
index 02fa427..02fa427 100644
--- a/src/stage4/patches/dhcp.patch
+++ b/src/stage4/patches/generic/dhcp.patch
diff --git a/src/stage4/patches/doxygen-breakdeps.patch b/src/stage4/patches/generic/doxygen-breakdeps.patch
index 0326760..0326760 100644
--- a/src/stage4/patches/doxygen-breakdeps.patch
+++ b/src/stage4/patches/generic/doxygen-breakdeps.patch
diff --git a/src/stage4/patches/doxygen.patch b/src/stage4/patches/generic/doxygen.patch
index 4399ee0..4399ee0 100644
--- a/src/stage4/patches/doxygen.patch
+++ b/src/stage4/patches/generic/doxygen.patch
diff --git a/src/stage4/patches/ffmpeg-breakdeps.patch b/src/stage4/patches/generic/ffmpeg-breakdeps.patch
index 5375dd8..5375dd8 100644
--- a/src/stage4/patches/ffmpeg-breakdeps.patch
+++ b/src/stage4/patches/generic/ffmpeg-breakdeps.patch
diff --git a/src/stage4/patches/fftw.patch b/src/stage4/patches/generic/fftw.patch
index c6a01ee..c6a01ee 100644
--- a/src/stage4/patches/fftw.patch
+++ b/src/stage4/patches/generic/fftw.patch
diff --git a/src/stage4/patches/fontconfig-breakdeps.patch b/src/stage4/patches/generic/fontconfig-breakdeps.patch
index 661787c..661787c 100644
--- a/src/stage4/patches/fontconfig-breakdeps.patch
+++ b/src/stage4/patches/generic/fontconfig-breakdeps.patch
diff --git a/src/stage4/patches/fontconfig.patch b/src/stage4/patches/generic/fontconfig.patch
index c96eff1..c96eff1 100644
--- a/src/stage4/patches/fontconfig.patch
+++ b/src/stage4/patches/generic/fontconfig.patch
diff --git a/src/stage4/patches/freetype2-breakdeps.patch b/src/stage4/patches/generic/freetype2-breakdeps.patch
index 82ce5c1..82ce5c1 100644
--- a/src/stage4/patches/freetype2-breakdeps.patch
+++ b/src/stage4/patches/generic/freetype2-breakdeps.patch
diff --git a/src/stage4/patches/generic/gcc.patch b/src/stage4/patches/generic/gcc.patch
new file mode 100644
index 0000000..0b18745
--- /dev/null
+++ b/src/stage4/patches/generic/gcc.patch
@@ -0,0 +1,414 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-05-22 07:55:24.952880476 +0200
++++ b/PKGBUILD	2018-05-22 08:05:15.696219707 +0200
+@@ -5,7 +5,8 @@
+ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+ # NOTE: libtool requires rebuilt with each new gcc version
+ 
+-pkgname=(gcc gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go lib32-gcc-libs)
++pkgname=(gcc gcc-libs gcc-fortran)
++[ "x@MULTILIB@" == "xdisable" ] || pkgname+=(lib32-gcc-libs)
+ pkgver=8.1.0
+ _majorver=${pkgver:0:1}
+ _islver=0.18
+@@ -14,13 +15,14 @@ pkgdesc='The GNU Compiler Collection'
+ arch=(x86_64)
+ license=(GPL LGPL FDL custom)
+ url='http://gcc.gnu.org'
+-makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python)
+-checkdepends=(dejagnu inetutils)
++makedepends=(binutils libmpc)
++[ "x@MULTILIB@" == "xdisable" ] || makedepends+=(lib32-glibc lib32-gcc-libs)
++checkdepends=(dejagnu)
+ 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)
++        c89 c99 pure64.patch)
+ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
+               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
+               33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
+@@ -28,7 +30,8 @@ sha256sums=('1d1866f992626e61349a1ccd0b8
+             'SKIP'
+             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
+             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
+-            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
++            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
++            'ce8fd53670d34ab3a57a50d1f9b15a905c79bda611d447f52cd1612846682224')
+ 
+ _svnrev=259195
+ _svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
+@@ -63,7 +66,7 @@ prepare() {
+   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
++  patch -Np1 -i "$srcdir"/pure64.patch
+ 
+   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+@@ -80,15 +83,16 @@ build() {
+   CXXFLAGS=${CXXFLAGS/-pipe/}
+ 
+   "$srcdir/gcc/configure" --prefix=/usr \
++      @GCC_CONFIG_FLAGS@ \
+       --libdir=/usr/lib \
+       --libexecdir=/usr/lib \
+       --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-languages=c,c++,fortran,lto \
+       --enable-shared \
+       --enable-threads=posix \
+-      --enable-libmpx \
++      --disable-libmpx \
+       --with-system-zlib \
+       --with-isl \
+       --enable-__cxa_atexit \
+@@ -103,16 +107,13 @@ build() {
+       --enable-install-libiberty \
+       --with-linker-hash-style=gnu \
+       --enable-gnu-indirect-function \
+-      --enable-multilib \
++      --@MULTILIB@-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() {
+@@ -137,23 +138,16 @@ package_gcc-libs() {
+ 
+   for lib in libatomic \
+              libgfortran \
+-             libgo \
+              libgomp \
+-             libitm \
+              libquadmath \
+-             libsanitizer/{a,l,ub,t}san \
+-             libstdc++-v3/src \
+-             libvtv; do
++             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"
+ 
+   for lib in libgomp \
+-             libitm \
+              libquadmath; do
+     make -C $CHOST/$lib DESTDIR="$pkgdir" install-info
+   done
+@@ -184,22 +178,18 @@ package_gcc() {
+   install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1}
+ 
+   make -C $CHOST/libgcc DESTDIR="$pkgdir" install
+-  make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install
++  [ "x@MULTILIB@" == "xdisable" ] || 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
++  [ "x@MULTILIB@" == "xdisable" ] || make -C $CHOST/32/libstdc++-v3/src DESTDIR="$pkgdir" install
++  [ "x@MULTILIB@" == "xdisable" ] || make -C $CHOST/32/libstdc++-v3/include DESTDIR="$pkgdir" install
++  [ "x@MULTILIB@" == "xdisable" ] || 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*
++  rm -f "$pkgdir"/usr/lib{,32}/libstdc++.so*
+ 
+   make DESTDIR="$pkgdir" install-fixincludes
+   make -C gcc DESTDIR="$pkgdir" install-mkheaders
+@@ -210,23 +200,15 @@ package_gcc() {
+     "$pkgdir/usr/lib/bfd-plugins/"
+ 
+   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/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
++  [ "x@MULTILIB@" == "xdisable" ] || make -C $CHOST/32/libgomp 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/{gccgo,gfortran}.1
+-  rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
++  rm -f "$pkgdir"/usr/share/man/man1/{gccgo,gfortran}.1
++  rm -f "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
+ 
+   make -C libcpp DESTDIR="$pkgdir" install
+   make -C gcc DESTDIR="$pkgdir" install-po
+@@ -238,16 +220,9 @@ package_gcc() {
+   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
+ 
+-  # byte-compile python libraries
+-  python -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
+-  python -O -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
+-
+   # Install Runtime Library Exception
+   install -d "$pkgdir/usr/share/licenses/$pkgname/"
+   ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+@@ -263,7 +238,7 @@ package_gcc-fortran() {
+   cd gcc-build
+   make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
+     install-{toolexeclibDATA,nodist_fincludeHEADERS}
+-  make -C $CHOST/32/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
++  [ "x@MULTILIB@" == "xdisable" ] || 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}
+diff -rupN a/pure64.patch b/pure64.patch
+--- a/pure64.patch	1970-01-01 01:00:00.000000000 +0100
++++ b/pure64.patch	2018-05-22 08:05:15.702886374 +0200
+@@ -0,0 +1,217 @@
++Submitted By: William Harrington <kb0iic at cross-lfs dot org>
++Date: 05-13-2017
++Initial Package Version: 6.1.0
++Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
++        the Pure LFS project with help from
++        Martin Ward and Chris Staub
++Upstream Status: Not Applied - CLFS Specific
++Description: This patch makes changes to the paths for pure64, eg 64bit libs
++             in /usr/lib, 32bit in /usr/lib32.
++Comment: Rediffed for 7.1.0
++
++tweaked for powerpc64le gcc 8.1.0
++
++diff -rupN gcc-8.1.0.old/gcc/config/i386/linux64.h gcc-8.1.0/gcc/config/i386/linux64.h
++--- gcc-8.1.0.old/gcc/config/i386/linux64.h	2018-05-21 12:04:55.942167767 +0200
+++++ gcc-8.1.0/gcc/config/i386/linux64.h	2018-05-21 12:05:08.352167891 +0200
++@@ -27,8 +27,8 @@ see the files COPYING3 and COPYING.RUNTI
++ #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"
++ 
++ #undef MUSL_DYNAMIC_LINKER32
++diff -rupN gcc-8.1.0.old/gcc/config/i386/t-linux64 gcc-8.1.0/gcc/config/i386/t-linux64
++--- gcc-8.1.0.old/gcc/config/i386/t-linux64	2018-05-21 12:04:55.945501101 +0200
+++++ gcc-8.1.0/gcc/config/i386/t-linux64	2018-05-21 12:05:08.445501226 +0200
++@@ -33,6 +33,6 @@
++ comma=,
++ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
++ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
++-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
++-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+++MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
+++MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
++ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
++diff -rupN gcc-8.1.0.old/gcc/config/linux.h gcc-8.1.0/gcc/config/linux.h
++--- gcc-8.1.0.old/gcc/config/linux.h	2018-05-21 12:04:55.928834434 +0200
+++++ gcc-8.1.0/gcc/config/linux.h	2018-05-21 12:05:08.445501226 +0200
++@@ -82,7 +82,7 @@ see the files COPYING3 and COPYING.RUNTI
++    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
++    supporting both 32-bit and 64-bit compilation.  */
++ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+++#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
++ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++ #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
++ #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
++diff -rupN gcc-8.1.0.old/gcc/config/mips/t-linux64 gcc-8.1.0/gcc/config/mips/t-linux64
++--- gcc-8.1.0.old/gcc/config/mips/t-linux64	2018-05-21 12:04:55.918834435 +0200
+++++ gcc-8.1.0/gcc/config/mips/t-linux64	2018-05-21 12:05:08.445501226 +0200
++@@ -22,5 +22,5 @@ MIPS_EL = $(if $(filter %el, $(firstword
++ MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
++ MULTILIB_OSDIRNAMES = \
++ 	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
++-	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
++-	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
+++	../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+++	../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
++diff -rupN gcc-8.1.0.old/gcc/config/rs6000/linux64.h gcc-8.1.0/gcc/config/rs6000/linux64.h
++--- gcc-8.1.0.old/gcc/config/rs6000/linux64.h	2018-05-21 12:04:55.972167768 +0200
+++++ gcc-8.1.0/gcc/config/rs6000/linux64.h	2018-05-21 12:05:08.445501226 +0200
++@@ -420,16 +420,16 @@ extern int dot_symbols;
++ #undef	LINK_OS_DEFAULT_SPEC
++ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
++ 
++-#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
+++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
++ 
++ #ifdef LINUX64_DEFAULT_ABI_ELFv2
++ #define GLIBC_DYNAMIC_LINKER64 \
++-"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
++-":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
+++"%{mabi=elfv1:/lib/ld64.so.1;" \
+++":/lib/ld64.so.2}"
++ #else
++ #define GLIBC_DYNAMIC_LINKER64 \
++-"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
++-":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
+++"%{mabi=elfv2:/lib/ld64.so.2;" \
+++":/lib/ld64.so.1}"
++ #endif
++ 
++ #define MUSL_DYNAMIC_LINKER32 \
++@@ -437,7 +437,7 @@ extern int dot_symbols;
++ #define MUSL_DYNAMIC_LINKER64 \
++   "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++ 
++-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+++#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
++ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++ #if DEFAULT_LIBC == LIBC_UCLIBC
++ #define CHOOSE_DYNAMIC_LINKER(G, U, M) \
++diff -rupN gcc-8.1.0.old/gcc/config/rs6000/t-ldouble-linux64le-ibm gcc-8.1.0/gcc/config/rs6000/t-ldouble-linux64le-ibm
++--- gcc-8.1.0.old/gcc/config/rs6000/t-ldouble-linux64le-ibm	2018-05-21 12:04:55.975501102 +0200
+++++ gcc-8.1.0/gcc/config/rs6000/t-ldouble-linux64le-ibm	2018-05-21 12:17:02.082175008 +0200
++@@ -21,6 +21,6 @@
++ 
++ MULTILIB_OPTIONS	+= mabi=ieeelongdouble/mabi=ibmlongdouble
++ MULTILIB_DIRNAMES	+= ieee128 ibm128
++-MULTILIB_OSDIRNAMES	+= mabi.ibmlongdouble=../lib64$(call if_multiarch,:powerpc64-linux-gnu) \
++-			   mabi.ieeelongdouble=../lib64/ieee128$(call if_multiarch,:powerpc64-linux-gnu) \
++-			   ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+++MULTILIB_OSDIRNAMES	+= mabi.ibmlongdouble=../lib$(call if_multiarch,:powerpc64-linux-gnu) \
+++			   mabi.ieeelongdouble=../lib/ieee128$(call if_multiarch,:powerpc64-linux-gnu) \
+++			   ../lib$(call if_multiarch,:powerpc64-linux-gnu)
++diff -rupN gcc-8.1.0.old/gcc/config/rs6000/t-ldouble-linux64le-ieee gcc-8.1.0/gcc/config/rs6000/t-ldouble-linux64le-ieee
++--- gcc-8.1.0.old/gcc/config/rs6000/t-ldouble-linux64le-ieee	2018-05-21 12:04:55.972167768 +0200
+++++ gcc-8.1.0/gcc/config/rs6000/t-ldouble-linux64le-ieee	2018-05-21 12:17:02.082175008 +0200
++@@ -21,6 +21,6 @@
++ 
++ MULTILIB_OPTIONS	+= mabi=ieeelongdouble/mabi=ibmlongdouble
++ MULTILIB_DIRNAMES	+= ieee128 ibm128
++-MULTILIB_OSDIRNAMES	+= mabi.ibmlongdouble=../lib64/ibm128$(call if_multiarch,:powerpc64-linux-gnu) \
++-			   mabi.ieeelongdouble=../lib64$(call if_multiarch,:powerpc64-linux-gnu) \
++-			   ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+++MULTILIB_OSDIRNAMES	+= mabi.ibmlongdouble=../lib/ibm128$(call if_multiarch,:powerpc64-linux-gnu) \
+++			   mabi.ieeelongdouble=../lib$(call if_multiarch,:powerpc64-linux-gnu) \
+++			   ../lib$(call if_multiarch,:powerpc64-linux-gnu)
++diff -rupN gcc-8.1.0.old/gcc/config/rs6000/t-linux gcc-8.1.0/gcc/config/rs6000/t-linux
++--- gcc-8.1.0.old/gcc/config/rs6000/t-linux	2018-05-21 12:04:55.972167768 +0200
+++++ gcc-8.1.0/gcc/config/rs6000/t-linux	2018-05-21 12:17:02.082175008 +0200
++@@ -2,7 +2,7 @@
++ # or soft-float.
++ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
++ ifneq (,$(findstring powerpc64,$(target)))
++-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+++MULTILIB_OSDIRNAMES := .=../lib$(call if_multiarch,:powerpc64-linux-gnu)
++ else
++ MULTIARCH_DIRNAME := powerpc-linux-gnu
++ endif
++diff -rupN gcc-8.1.0.old/gcc/config/rs6000/t-linux64 gcc-8.1.0/gcc/config/rs6000/t-linux64
++--- gcc-8.1.0.old/gcc/config/rs6000/t-linux64	2018-05-21 12:04:55.972167768 +0200
+++++ gcc-8.1.0/gcc/config/rs6000/t-linux64	2018-05-21 12:17:02.082175008 +0200
++@@ -28,8 +28,8 @@
++ MULTILIB_OPTIONS    := m64/m32
++ MULTILIB_DIRNAMES   := 64 32
++ MULTILIB_EXTRA_OPTS := 
++-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
++-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
+++MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
+++MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
++ 
++ rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
++ 	$(COMPILE) $<
++diff -rupN gcc-8.1.0.old/gcc/config/s390/linux.h gcc-8.1.0/gcc/config/s390/linux.h
++--- gcc-8.1.0.old/gcc/config/s390/linux.h	2018-05-21 12:04:55.938834435 +0200
+++++ gcc-8.1.0/gcc/config/s390/linux.h	2018-05-21 12:05:08.445501226 +0200
++@@ -73,7 +73,7 @@ along with GCC; see the file COPYING3.
++ #define MULTILIB_DEFAULTS { "m31" }
++ #endif
++ 
++-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
++ #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
++ 
++ #undef  LINK_SPEC
++diff -rupN gcc-8.1.0.old/gcc/config/s390/t-linux64 gcc-8.1.0/gcc/config/s390/t-linux64
++--- gcc-8.1.0.old/gcc/config/s390/t-linux64	2018-05-21 12:04:55.938834435 +0200
+++++ gcc-8.1.0/gcc/config/s390/t-linux64	2018-05-21 12:05:08.445501226 +0200
++@@ -7,5 +7,5 @@
++ 
++ MULTILIB_OPTIONS = m64/m31
++ MULTILIB_DIRNAMES = 64 32
++-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
++-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
+++MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
+++MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
++diff -rupN gcc-8.1.0.old/gcc/config/sparc/linux64.h gcc-8.1.0/gcc/config/sparc/linux64.h
++--- gcc-8.1.0.old/gcc/config/sparc/linux64.h	2018-05-21 12:04:55.948834435 +0200
+++++ gcc-8.1.0/gcc/config/sparc/linux64.h	2018-05-21 12:05:08.445501226 +0200
++@@ -84,8 +84,8 @@ along with GCC; see the file COPYING3.
++    When the -shared link option is used a final link is not being
++    done.  */
++ 
++-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
++-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
++ 
++ #ifdef SPARC_BI_ARCH
++ 
++@@ -213,7 +213,7 @@ extern const char *host_detect_local_cpu
++ #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 -Y P,%R/lib %{shared:-shared} \
++   %{!shared: \
++     %{!static: \
++       %{rdynamic:-export-dynamic} \
++diff -rupN gcc-8.1.0.old/gcc/config/sparc/linux.h gcc-8.1.0/gcc/config/sparc/linux.h
++--- gcc-8.1.0.old/gcc/config/sparc/linux.h	2018-05-21 12:04:55.952167768 +0200
+++++ gcc-8.1.0/gcc/config/sparc/linux.h	2018-05-21 12:05:08.445501226 +0200
++@@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu
++    When the -shared link option is used a final link is not being
++    done.  */
++ 
++-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+++#define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2"
++ 
++ #undef  LINK_SPEC
++ #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
++diff -rupN gcc-8.1.0.old/gcc/config/sparc/t-linux64 gcc-8.1.0/gcc/config/sparc/t-linux64
++--- gcc-8.1.0.old/gcc/config/sparc/t-linux64	2018-05-21 12:04:55.948834435 +0200
+++++ gcc-8.1.0/gcc/config/sparc/t-linux64	2018-05-21 12:05:08.445501226 +0200
++@@ -25,5 +25,5 @@
++ 
++ MULTILIB_OPTIONS = m64/m32
++ MULTILIB_DIRNAMES = 64 32
++-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
++-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
+++MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
+++MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
diff --git a/src/stage4/patches/ghostscript-breakdeps.patch b/src/stage4/patches/generic/ghostscript-breakdeps.patch
index f33b007..f33b007 100644
--- a/src/stage4/patches/ghostscript-breakdeps.patch
+++ b/src/stage4/patches/generic/ghostscript-breakdeps.patch
diff --git a/src/stage4/patches/glibc.patch b/src/stage4/patches/generic/glibc.patch
index 0ed324d..5db3721 100644
--- a/src/stage4/patches/glibc.patch
+++ b/src/stage4/patches/generic/glibc.patch
@@ -1,6 +1,6 @@
---- a/PKGBUILD	2018-03-21 10:05:48.270438408 +0100
-+++ b/PKGBUILD	2018-03-21 10:08:59.870913388 +0100
-@@ -6,21 +6,23 @@
+--- a/PKGBUILD	2018-03-06 06:01:42.289066523 +0100
++++ b/PKGBUILD	2018-03-06 06:01:42.289066523 +0100
+@@ -6,21 +6,21 @@
  # NOTE: valgrind requires rebuilt with each major glibc version
  
  pkgbase=glibc
@@ -15,8 +15,6 @@
  url='http://www.gnu.org/software/libc'
  license=(GPL LGPL)
 -makedepends=(git gd lib32-gcc-libs)
-+makedepends=(gd)
-+[ "x@MULTILIB@" != "xenable" ] || makedepends+=(lib32-gcc-libs)
  options=(!strip staticlibs)
  _commit=de51f431ed6226ec68ca76e578f2cbd55b6262cb
 -source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
@@ -30,7 +28,7 @@
           '07ac979b6ab5eeb778d55f041529d623'
           '476e9113489f93b348b21e144b6a8fcf'
           '6e052f1cb693d5d3203f50f9d4e8c33b'
-@@ -29,6 +31,7 @@ md5sums=('SKIP'
+@@ -29,6 +29,7 @@ md5sums=('SKIP'
  prepare() {
    mkdir -p glibc-build lib32-glibc-build
  
@@ -38,7 +36,7 @@
    cd glibc
  
    local i; for i in ${source[@]}; do
-@@ -49,7 +52,7 @@ build() {
+@@ -49,7 +50,7 @@ build() {
        --enable-add-ons
        --enable-bind-now
        --enable-lock-elision
@@ -47,7 +45,7 @@
        --enable-obsolete-nsl
        --enable-obsolete-rpc
        --enable-stack-protector=strong
-@@ -84,6 +87,8 @@ build() {
+@@ -84,6 +85,8 @@ build() {
    echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms
    make
  
@@ -56,7 +54,7 @@
    cd "$srcdir/lib32-glibc-build"
    export CC="gcc -m32 -mstackrealign"
    export CXX="g++ -m32 -mstackrealign"
-@@ -177,7 +182,7 @@ package_glibc() {
+@@ -177,7 +170,7 @@ package_glibc() {
      strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
                          usr/lib/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \
                          usr/lib/lib{resolv,rpcsvc,rt,util}.a \
diff --git a/src/stage4/patches/glibmm.patch b/src/stage4/patches/generic/glibmm.patch
index 8f619e2..8f619e2 100644
--- a/src/stage4/patches/glibmm.patch
+++ b/src/stage4/patches/generic/glibmm.patch
diff --git a/src/stage4/patches/gpm.patch b/src/stage4/patches/generic/gpm.patch
index da03262..da03262 100644
--- a/src/stage4/patches/gpm.patch
+++ b/src/stage4/patches/generic/gpm.patch
diff --git a/src/stage4/patches/graphite-breakdeps.patch b/src/stage4/patches/generic/graphite-breakdeps.patch
index 5504ca2..5504ca2 100644
--- a/src/stage4/patches/graphite-breakdeps.patch
+++ b/src/stage4/patches/generic/graphite-breakdeps.patch
diff --git a/src/stage4/patches/graphite.patch b/src/stage4/patches/generic/graphite.patch
index ed33b0e..ed33b0e 100644
--- a/src/stage4/patches/graphite.patch
+++ b/src/stage4/patches/generic/graphite.patch
diff --git a/src/stage4/patches/graphviz-breakdeps.patch b/src/stage4/patches/generic/graphviz-breakdeps.patch
index eb56bb2..eb56bb2 100644
--- a/src/stage4/patches/graphviz-breakdeps.patch
+++ b/src/stage4/patches/generic/graphviz-breakdeps.patch
diff --git a/src/stage4/patches/graphviz.patch b/src/stage4/patches/generic/graphviz.patch
index 6478656..6478656 100644
--- a/src/stage4/patches/graphviz.patch
+++ b/src/stage4/patches/generic/graphviz.patch
diff --git a/src/stage4/patches/generic/gstreamer.patch b/src/stage4/patches/generic/gstreamer.patch
new file mode 100644
index 0000000..6240044
--- /dev/null
+++ b/src/stage4/patches/generic/gstreamer.patch
@@ -0,0 +1,14 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-04-11 06:50:38.438010392 +0200
++++ b/PKGBUILD	2018-04-11 08:32:21.806431931 +0200
+@@ -9,8 +9,8 @@ pkgdesc="GStreamer open-source multimedi
+ url="https://gstreamer.freedesktop.org/"
+ arch=(x86_64)
+ license=(LGPL)
+-depends=(libxml2 glib2 libunwind libcap libelf)
+-makedepends=(gtk-doc gobject-introspection autoconf-archive git valgrind bash-completion)
++depends=(libxml2 glib2 libcap libelf)
++makedepends=(gtk-doc gobject-introspection autoconf-archive git bash-completion)
+ checkdepends=(gmp gsl gtk3)
+ _commit=80e0e90d00bb358ca9dc071cf6de010ec5ae2644  # tags/1.14.0^0
+ install=gstreamer.install
diff --git a/src/stage4/patches/gtk3-breakdeps.patch b/src/stage4/patches/generic/gtk3-breakdeps.patch
index ceb2310..ceb2310 100644
--- a/src/stage4/patches/gtk3-breakdeps.patch
+++ b/src/stage4/patches/generic/gtk3-breakdeps.patch
diff --git a/src/stage4/patches/gypsy.patch b/src/stage4/patches/generic/gypsy.patch
index 17812ce..17812ce 100644
--- a/src/stage4/patches/gypsy.patch
+++ b/src/stage4/patches/generic/gypsy.patch
diff --git a/src/stage4/patches/harfbuzz-breakdeps.patch b/src/stage4/patches/generic/harfbuzz-breakdeps.patch
index 41d0fe7..41d0fe7 100644
--- a/src/stage4/patches/harfbuzz-breakdeps.patch
+++ b/src/stage4/patches/generic/harfbuzz-breakdeps.patch
diff --git a/src/stage4/patches/lash.patch b/src/stage4/patches/generic/lash.patch
index a43fae2..a43fae2 100644
--- a/src/stage4/patches/lash.patch
+++ b/src/stage4/patches/generic/lash.patch
diff --git a/src/stage4/patches/libbluray.patch b/src/stage4/patches/generic/libbluray.patch
index dcf8260..dcf8260 100644
--- a/src/stage4/patches/libbluray.patch
+++ b/src/stage4/patches/generic/libbluray.patch
diff --git a/src/stage4/patches/libcanberra-breakdeps.patch b/src/stage4/patches/generic/libcanberra-breakdeps.patch
index 5ba58b0..5ba58b0 100644
--- a/src/stage4/patches/libcanberra-breakdeps.patch
+++ b/src/stage4/patches/generic/libcanberra-breakdeps.patch
diff --git a/src/stage4/patches/libdrm.patch b/src/stage4/patches/generic/libdrm.patch
index b52378a..b52378a 100644
--- a/src/stage4/patches/libdrm.patch
+++ b/src/stage4/patches/generic/libdrm.patch
diff --git a/src/stage4/patches/libevdev.patch b/src/stage4/patches/generic/libevdev.patch
index ea4df75..ea4df75 100644
--- a/src/stage4/patches/libevdev.patch
+++ b/src/stage4/patches/generic/libevdev.patch
diff --git a/src/stage4/patches/libffado-breakdeps.patch b/src/stage4/patches/generic/libffado-breakdeps.patch
index 6735a11..6735a11 100644
--- a/src/stage4/patches/libffado-breakdeps.patch
+++ b/src/stage4/patches/generic/libffado-breakdeps.patch
diff --git a/src/stage4/patches/libfontenc.patch b/src/stage4/patches/generic/libfontenc.patch
index cbca51f..cbca51f 100644
--- a/src/stage4/patches/libfontenc.patch
+++ b/src/stage4/patches/generic/libfontenc.patch
diff --git a/src/stage4/patches/libglvnd-breakdeps.patch b/src/stage4/patches/generic/libglvnd-breakdeps.patch
index 486de8f..486de8f 100644
--- a/src/stage4/patches/libglvnd-breakdeps.patch
+++ b/src/stage4/patches/generic/libglvnd-breakdeps.patch
diff --git a/src/stage4/patches/libid3tag.patch b/src/stage4/patches/generic/libid3tag.patch
index 8e629a7..8e629a7 100644
--- a/src/stage4/patches/libid3tag.patch
+++ b/src/stage4/patches/generic/libid3tag.patch
diff --git a/src/stage4/patches/libimobiledevice-breakdeps.patch b/src/stage4/patches/generic/libimobiledevice-breakdeps.patch
index e62be5e..e62be5e 100644
--- a/src/stage4/patches/libimobiledevice-breakdeps.patch
+++ b/src/stage4/patches/generic/libimobiledevice-breakdeps.patch
diff --git a/src/stage4/patches/libjpeg-turbo-breakdeps.patch b/src/stage4/patches/generic/libjpeg-turbo-breakdeps.patch
index 14e733c..14e733c 100644
--- a/src/stage4/patches/libjpeg-turbo-breakdeps.patch
+++ b/src/stage4/patches/generic/libjpeg-turbo-breakdeps.patch
diff --git a/src/stage4/patches/libjpeg-turbo.patch b/src/stage4/patches/generic/libjpeg-turbo.patch
index dbdcfbc..dbdcfbc 100644
--- a/src/stage4/patches/libjpeg-turbo.patch
+++ b/src/stage4/patches/generic/libjpeg-turbo.patch
diff --git a/src/stage4/patches/libproxy-breakdeps.patch b/src/stage4/patches/generic/libproxy-breakdeps.patch
index a236d6f..a236d6f 100644
--- a/src/stage4/patches/libproxy-breakdeps.patch
+++ b/src/stage4/patches/generic/libproxy-breakdeps.patch
diff --git a/src/stage4/patches/librsvg-breakdeps.patch b/src/stage4/patches/generic/librsvg-breakdeps.patch
index 4c75214..4c75214 100644
--- a/src/stage4/patches/librsvg-breakdeps.patch
+++ b/src/stage4/patches/generic/librsvg-breakdeps.patch
diff --git a/src/stage4/patches/librsvg.patch b/src/stage4/patches/generic/librsvg.patch
index 03265e2..03265e2 100644
--- a/src/stage4/patches/librsvg.patch
+++ b/src/stage4/patches/generic/librsvg.patch
diff --git a/src/stage4/patches/libsigc++-breakdeps.patch b/src/stage4/patches/generic/libsigc++-breakdeps.patch
index 24635df..24635df 100644
--- a/src/stage4/patches/libsigc++-breakdeps.patch
+++ b/src/stage4/patches/generic/libsigc++-breakdeps.patch
diff --git a/src/stage4/patches/libsndfile.patch b/src/stage4/patches/generic/libsndfile.patch
index 3befd7a..3befd7a 100644
--- a/src/stage4/patches/libsndfile.patch
+++ b/src/stage4/patches/generic/libsndfile.patch
diff --git a/src/stage4/patches/libsodium-breakdeps.patch b/src/stage4/patches/generic/libsodium-breakdeps.patch
index 18a03fd..18a03fd 100644
--- a/src/stage4/patches/libsodium-breakdeps.patch
+++ b/src/stage4/patches/generic/libsodium-breakdeps.patch
diff --git a/src/stage4/patches/libtiff-breakdeps.patch b/src/stage4/patches/generic/libtiff-breakdeps.patch
index 34322eb..34322eb 100644
--- a/src/stage4/patches/libtiff-breakdeps.patch
+++ b/src/stage4/patches/generic/libtiff-breakdeps.patch
diff --git a/src/stage4/patches/libva-breakdeps.patch b/src/stage4/patches/generic/libva-breakdeps.patch
index e8624da..e8624da 100644
--- a/src/stage4/patches/libva-breakdeps.patch
+++ b/src/stage4/patches/generic/libva-breakdeps.patch
diff --git a/src/stage4/patches/libxft.patch b/src/stage4/patches/generic/libxft.patch
index 1031e35..1031e35 100644
--- a/src/stage4/patches/libxft.patch
+++ b/src/stage4/patches/generic/libxft.patch
diff --git a/src/stage4/patches/lm_sensors-breakdeps.patch b/src/stage4/patches/generic/lm_sensors-breakdeps.patch
index a09db10..a09db10 100644
--- a/src/stage4/patches/lm_sensors-breakdeps.patch
+++ b/src/stage4/patches/generic/lm_sensors-breakdeps.patch
diff --git a/src/stage4/patches/lynx.patch b/src/stage4/patches/generic/lynx.patch
index 26ef5f7..26ef5f7 100644
--- a/src/stage4/patches/lynx.patch
+++ b/src/stage4/patches/generic/lynx.patch
diff --git a/src/stage4/patches/make.patch b/src/stage4/patches/generic/make.patch
index a71388c..a71388c 100644
--- a/src/stage4/patches/make.patch
+++ b/src/stage4/patches/generic/make.patch
diff --git a/src/stage4/patches/mkinitcpio-busybox.patch b/src/stage4/patches/generic/mkinitcpio-busybox.patch
index 506c70d..372e014 100644
--- a/src/stage4/patches/mkinitcpio-busybox.patch
+++ b/src/stage4/patches/generic/mkinitcpio-busybox.patch
@@ -5,7 +5,7 @@
    cd "busybox-$pkgver"
  
 -  local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
-+  local safeflags="-march=rv64gc -mabi=lp64d -Os -pipe -fno-strict-aliasing"
++  local safeflags="@PLATFORM_CFLAGS@ -Os -pipe -fno-strict-aliasing"
  
    sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" > .config
  }
diff --git a/src/stage4/patches/neon.patch b/src/stage4/patches/generic/neon.patch
index ff1d749..ff1d749 100644
--- a/src/stage4/patches/neon.patch
+++ b/src/stage4/patches/generic/neon.patch
diff --git a/src/stage4/patches/openexr.patch b/src/stage4/patches/generic/openexr.patch
index ba43fe0..ba43fe0 100644
--- a/src/stage4/patches/openexr.patch
+++ b/src/stage4/patches/generic/openexr.patch
diff --git a/src/stage4/patches/openmpi.patch b/src/stage4/patches/generic/openmpi.patch
index 84a7808..84a7808 100644
--- a/src/stage4/patches/openmpi.patch
+++ b/src/stage4/patches/generic/openmpi.patch
diff --git a/src/stage4/patches/orc.patch b/src/stage4/patches/generic/orc.patch
index 05d19e8..05d19e8 100644
--- a/src/stage4/patches/orc.patch
+++ b/src/stage4/patches/generic/orc.patch
diff --git a/src/stage4/patches/phonon-breakdeps.patch b/src/stage4/patches/generic/phonon-breakdeps.patch
index 5cb9748..5cb9748 100644
--- a/src/stage4/patches/phonon-breakdeps.patch
+++ b/src/stage4/patches/generic/phonon-breakdeps.patch
diff --git a/src/stage4/patches/poppler-breakdeps.patch b/src/stage4/patches/generic/poppler-breakdeps.patch
index dbf1fd5..dbf1fd5 100644
--- a/src/stage4/patches/poppler-breakdeps.patch
+++ b/src/stage4/patches/generic/poppler-breakdeps.patch
diff --git a/src/stage4/patches/pulseaudio-breakdeps.patch b/src/stage4/patches/generic/pulseaudio-breakdeps.patch
index 2e22df1..2e22df1 100644
--- a/src/stage4/patches/pulseaudio-breakdeps.patch
+++ b/src/stage4/patches/generic/pulseaudio-breakdeps.patch
diff --git a/src/stage4/patches/pulseaudio.patch b/src/stage4/patches/generic/pulseaudio.patch
index df76448..df76448 100644
--- a/src/stage4/patches/pulseaudio.patch
+++ b/src/stage4/patches/generic/pulseaudio.patch
diff --git a/src/stage4/patches/pyqt5.patch b/src/stage4/patches/generic/pyqt5.patch
index 3052d38..3052d38 100644
--- a/src/stage4/patches/pyqt5.patch
+++ b/src/stage4/patches/generic/pyqt5.patch
diff --git a/src/stage4/patches/python-lxml.patch b/src/stage4/patches/generic/python-lxml.patch
index bd1d890..bd1d890 100644
--- a/src/stage4/patches/python-lxml.patch
+++ b/src/stage4/patches/generic/python-lxml.patch
diff --git a/src/stage4/patches/python.patch b/src/stage4/patches/generic/python.patch
index 08ce6da..08ce6da 100644
--- a/src/stage4/patches/python.patch
+++ b/src/stage4/patches/generic/python.patch
diff --git a/src/stage4/patches/python2.patch b/src/stage4/patches/generic/python2.patch
index 4dd87cd..4dd87cd 100644
--- a/src/stage4/patches/python2.patch
+++ b/src/stage4/patches/generic/python2.patch
diff --git a/src/stage4/patches/qt5-base.patch b/src/stage4/patches/generic/qt5-base.patch
index 797563e..797563e 100644
--- a/src/stage4/patches/qt5-base.patch
+++ b/src/stage4/patches/generic/qt5-base.patch
diff --git a/src/stage4/patches/qt5-tools-breakdeps.patch b/src/stage4/patches/generic/qt5-tools-breakdeps.patch
index 063fe24..063fe24 100644
--- a/src/stage4/patches/qt5-tools-breakdeps.patch
+++ b/src/stage4/patches/generic/qt5-tools-breakdeps.patch
diff --git a/src/stage4/patches/generic/qt5-webkit.patch b/src/stage4/patches/generic/qt5-webkit.patch
new file mode 100644
index 0000000..cebd93b
--- /dev/null
+++ b/src/stage4/patches/generic/qt5-webkit.patch
@@ -0,0 +1,34 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-04-16 21:02:39.504221456 +0200
++++ b/PKGBUILD	2018-04-16 21:06:13.560201168 +0200
+@@ -12,7 +12,7 @@ url='http://qt-project.org/'
+ license=(GPL3 LGPL3 FDL custom)
+ pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
+ depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen)
+-makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
++makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools ninja)
+ optdepends=('gst-plugins-good: Webm codec support')
+ conflicts=(qt5-webkit-ng)
+ replaces=(qt5-webkit-ng)
+@@ -44,16 +46,18 @@ prepare() {
+   cd build
+ 
+   cmake ../qtwebkit-$_qtver \
++    -G Ninja \
+     -DCMAKE_INSTALL_PREFIX=/usr \
+     -DCMAKE_BUILD_TYPE=Release \
+     -DPORT=Qt \
+-    -DENABLE_TOOLS=OFF
+-  make
++    -DENABLE_TOOLS=OFF \
++    -DENABLE_JIT=OFF
++  ninja
+ }
+ 
+ package() {
+   cd build
+-  make DESTDIR="$pkgdir" install
++  DESTDIR="$pkgdir" ninja install
+ 
+   install -d "$pkgdir"/usr/share/licenses
+   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
diff --git a/src/stage4/patches/r-breakdeps.patch b/src/stage4/patches/generic/r-breakdeps.patch
index 5cc9267..5cc9267 100644
--- a/src/stage4/patches/r-breakdeps.patch
+++ b/src/stage4/patches/generic/r-breakdeps.patch
diff --git a/src/stage4/patches/r.patch b/src/stage4/patches/generic/r.patch
index f4beb2f..f4beb2f 100644
--- a/src/stage4/patches/r.patch
+++ b/src/stage4/patches/generic/r.patch
diff --git a/src/stage4/patches/ruby-rdiscount.patch b/src/stage4/patches/generic/ruby-rdiscount.patch
index 335806e..335806e 100644
--- a/src/stage4/patches/ruby-rdiscount.patch
+++ b/src/stage4/patches/generic/ruby-rdiscount.patch
diff --git a/src/stage4/patches/rust-breakdeps.patch b/src/stage4/patches/generic/rust-breakdeps.patch
index dfe4903..dfe4903 100644
--- a/src/stage4/patches/rust-breakdeps.patch
+++ b/src/stage4/patches/generic/rust-breakdeps.patch
diff --git a/src/stage4/patches/sqlite.patch b/src/stage4/patches/generic/sqlite.patch
index 9b8a670..9b8a670 100644
--- a/src/stage4/patches/sqlite.patch
+++ b/src/stage4/patches/generic/sqlite.patch
diff --git a/src/stage4/patches/subversion-breakdeps.patch b/src/stage4/patches/generic/subversion-breakdeps.patch
index c7fa4a0..c7fa4a0 100644
--- a/src/stage4/patches/subversion-breakdeps.patch
+++ b/src/stage4/patches/generic/subversion-breakdeps.patch
diff --git a/src/stage4/patches/subversion.patch b/src/stage4/patches/generic/subversion.patch
index cf13d9c..cf13d9c 100644
--- a/src/stage4/patches/subversion.patch
+++ b/src/stage4/patches/generic/subversion.patch
diff --git a/src/stage4/patches/systemd.patch b/src/stage4/patches/generic/systemd.patch
index f915824..f915824 100644
--- a/src/stage4/patches/systemd.patch
+++ b/src/stage4/patches/generic/systemd.patch
diff --git a/src/stage4/patches/texlive-bin.patch.libsynctex b/src/stage4/patches/generic/texlive-bin.libsynctex.patch
index fd521b0..fd521b0 100644
--- a/src/stage4/patches/texlive-bin.patch.libsynctex
+++ b/src/stage4/patches/generic/texlive-bin.libsynctex.patch
diff --git a/src/stage4/patches/texlive-bin.patch b/src/stage4/patches/generic/texlive-bin.texlive-bin.patch
index 80a5e83..80a5e83 100644
--- a/src/stage4/patches/texlive-bin.patch
+++ b/src/stage4/patches/generic/texlive-bin.texlive-bin.patch
diff --git a/src/stage4/patches/tokyocabinet.patch b/src/stage4/patches/generic/tokyocabinet.patch
index 705d02b..705d02b 100644
--- a/src/stage4/patches/tokyocabinet.patch
+++ b/src/stage4/patches/generic/tokyocabinet.patch
diff --git a/src/stage4/patches/vala-breakdeps.patch b/src/stage4/patches/generic/vala-breakdeps.patch
index d7df56d..d7df56d 100644
--- a/src/stage4/patches/vala-breakdeps.patch
+++ b/src/stage4/patches/generic/vala-breakdeps.patch
diff --git a/src/stage4/patches/vid.stab.patch b/src/stage4/patches/generic/vid.stab.patch
index 7923a12..7923a12 100644
--- a/src/stage4/patches/vid.stab.patch
+++ b/src/stage4/patches/generic/vid.stab.patch
diff --git a/src/stage4/patches/vulkan-loader-layers.patch b/src/stage4/patches/generic/vulkan-loader-layers.patch
index 64580ea..64580ea 100644
--- a/src/stage4/patches/vulkan-loader-layers.patch
+++ b/src/stage4/patches/generic/vulkan-loader-layers.patch
diff --git a/src/stage4/patches/xfsprogs.patch b/src/stage4/patches/generic/xfsprogs.patch
index 5bdce59..257964a 100644
--- a/src/stage4/patches/xfsprogs.patch
+++ b/src/stage4/patches/generic/xfsprogs.patch
@@ -5,7 +5,7 @@
    cd "${srcdir}/${pkgname}-dev"
    make configure
 -  export OPTIMIZER="-march=${CARCH/_/-} -O1"
-+  export OPTIMIZER="-march=rv64gc -mabi=lp64d -O1"
++  export OPTIMIZER="@PLATFORM_CFLAGS@ -O1"
    export DEBUG=-DNDEBUG
    ./configure --prefix=/usr --sbindir=/usr/bin --enable-readline
    make
diff --git a/src/stage4/patches/xorg-server.patch b/src/stage4/patches/generic/xorg-server.patch
index 00bc0aa..00bc0aa 100644
--- a/src/stage4/patches/xorg-server.patch
+++ b/src/stage4/patches/generic/xorg-server.patch
diff --git a/src/stage4/patches/xz.patch b/src/stage4/patches/generic/xz.patch
index 55c6edc..55c6edc 100644
--- a/src/stage4/patches/xz.patch
+++ b/src/stage4/patches/generic/xz.patch
diff --git a/src/stage4/patches/powerpc64le/filesystem.patch b/src/stage4/patches/powerpc64le/filesystem.patch
new file mode 100644
index 0000000..a58c599
--- /dev/null
+++ b/src/stage4/patches/powerpc64le/filesystem.patch
@@ -0,0 +1,13 @@
+--- a/PKGBUILD	2018-02-20 22:53:28.088939649 +0100
++++ b/PKGBUILD	2018-02-21 10:12:21.862501784 +0100
+@@ -103,6 +103,10 @@ package() {
+     ln -s usr/lib lib64
+     ln -s lib usr/lib64
+   }
++  [[ $CARCH = 'powerpc64le' ]] && {
++    ln -s usr/lib lib64
++    ln -s lib usr/lib64
++  }
+ 
+   # add bin symlinks
+   ln -s usr/bin bin
diff --git a/src/stage4/patches/powerpc64le/linux-libre.patch b/src/stage4/patches/powerpc64le/linux-libre.patch
new file mode 100644
index 0000000..9d6cf4b
--- /dev/null
+++ b/src/stage4/patches/powerpc64le/linux-libre.patch
@@ -0,0 +1 @@
+FIXME
diff --git a/src/stage4/patches/powerpc64le/mesa.patch b/src/stage4/patches/powerpc64le/mesa.patch
new file mode 100644
index 0000000..3518f01
--- /dev/null
+++ b/src/stage4/patches/powerpc64le/mesa.patch
@@ -0,0 +1,49 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-04-10 10:23:30.086988693 +0200
++++ b/PKGBUILD	2018-04-10 10:23:30.087988693 +0200
+@@ -9,7 +9,7 @@ pkgrel=1.parabola1
+ arch=('i686' 'x86_64' 'armv7h')
+ makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
+              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
+-             'elfutils' 'llvm' 'libomxil-bellagio' 'clang' 'libglvnd' 'lm_sensors')
++             'elfutils' 'llvm' 'libomxil-bellagio' 'libglvnd' 'lm_sensors')
+ makedepends_x86_64=('libclc' 'libunwind')
+ makedepends_i686=("${makedepends_x86_64[@]}")
+ url="https://www.mesa3d.org/"
+@@ -57,6 +57,14 @@ build() {
+       VDPAU_AND_XA=
+       OPENCL=
+       ;;
++    powerpc64le)
++      GALLIUM=r300,r600,radeonsi,nouveau,swrast,virgl
++      DRI=r200,radeon,nouveau,swrast
++      VULKAN=
++      LIBUNWIND=
++      VDPAU_AND_XA='--enable-vdpau'
++      OPENCL=
++      ;;
+   esac
+ 
+   ./configure --prefix=/usr \
+@@ -85,8 +93,7 @@ build() {
+     $VDPAU_AND_XA \
+     --enable-omx-bellagio \
+     --enable-nine \
+-    $OPENCL \
+-    --with-clang-libdir=/usr/lib
++    $OPENCL
+ 
+   make
+ 
+@@ -125,11 +132,6 @@ package_mesa() {
+   cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/
+   cp -rv ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/
+ 
+-  if [ "$CARCH" != "armv7h" ]; then
+-    cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/
+-    cp -rv ${srcdir}/fakeinstall/usr/lib/libswrAVX*.so* ${pkgdir}/usr/lib/
+-  fi
+-
+   cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
+   cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+ 
diff --git a/src/stage4/patches/powerpc64le/openssl-1.0.patch b/src/stage4/patches/powerpc64le/openssl-1.0.patch
new file mode 100644
index 0000000..0f3f4ee
--- /dev/null
+++ b/src/stage4/patches/powerpc64le/openssl-1.0.patch
@@ -0,0 +1,19 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-04-05 07:57:08.773764780 +0200
++++ b/PKGBUILD	2018-04-05 07:57:08.774764779 +0200
+@@ -48,11 +48,14 @@ build() {
+ 	elif [ "${CARCH}" == 'i686' ]; then
+ 		openssltarget='linux-elf'
+ 		optflags=''
++	elif [ "${CARCH}" == 'powerpc64le' ]; then
++		openssltarget='linux-elf'
++		optflags=''
+ 	fi
+ 
+ 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+ 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib/openssl-1.0 \
+-		shared no-ssl3-method ${optflags} \
++		shared no-ssl3-method no-asm ${optflags} \
+ 		"${openssltarget}" \
+ 		"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+ 
diff --git a/src/stage4/patches/powerpc64le/openssl.patch b/src/stage4/patches/powerpc64le/openssl.patch
new file mode 100644
index 0000000..4ba9fb4
--- /dev/null
+++ b/src/stage4/patches/powerpc64le/openssl.patch
@@ -0,0 +1,18 @@
+--- a/PKGBUILD	2018-03-22 12:57:29.430740457 +0100
++++ b/PKGBUILD	2018-03-22 13:23:19.198868217 +0100
+@@ -38,11 +38,14 @@ build() {
+ 	elif [ "${CARCH}" == 'i686' ]; then
+ 		openssltarget='linux-elf'
+ 		optflags=''
++	elif [ "${CARCH}" == 'powerpc64le' ]; then
++		openssltarget='linux-elf'
++		optflags=''
+ 	fi
+ 
+ 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+ 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
+-		shared no-ssl3-method ${optflags} \
++		shared no-ssl3-method no-asm ${optflags} \
+ 		"${openssltarget}" \
+ 		"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+ 
diff --git a/src/stage4/patches/powerpc64le/pacman.patch b/src/stage4/patches/powerpc64le/pacman.patch
new file mode 100644
index 0000000..09c563a
--- /dev/null
+++ b/src/stage4/patches/powerpc64le/pacman.patch
@@ -0,0 +1,154 @@
+--- a/PKGBUILD	2018-03-17 22:43:27.776000901 +0100
++++ b/PKGBUILD	2018-03-17 22:45:57.506623741 +0100
+@@ -21,7 +20,7 @@ groups=('base' 'base-devel' 'base-openrc
+          'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring'
+          'archlinuxarm-keyring' 'archlinux32-keyring')
+ makedepends=('asciidoc')
+-makedepends+=('openssl>=1.1' 'openssl-1.0') # for during openssl 1.0->1.1 rebuild; remove on next rebuild
++makedepends+=('openssl>=1.1')
+ checkdepends=('python2' 'fakechroot')
+ optdepends=('cron: run specified programs at scheduled times and related tools')
+ provides=("$pkgname-contrib")
+@@ -45,6 +43,7 @@ sha256sums=('dfd36086ad68564bcd977f4a1fa
+             '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
+             '1b2c8f4ec84d0dc496516880a54b5e4deb78798618c9cf5e284a45303f156e58'
+             'b2cb3ba229edba338c0af7d7f5bb1a6ef6143bcd453c693bfee0c02fa1cfa18a'
++            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
+             '0d174c7c47921cfbb35dacb9d099095e78f6f67bfaa86836a3e588552f14ed03'
+             '1df848c5038a3f81ae4dc79a4072d340109b02f56292a5c4a20c59f735edd2b3'
+             '1cc4af1cf8e2133d4520827cc7d3ffad731892595f8e699909002d2e40ad8df9'
+@@ -96,6 +95,11 @@ build() {
+         mychost="armv7l-unknown-linux-gnueabihf"
+         myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt"
+         ;;
++      @CARCH@)
++        mycarch="@CARCH@"
++        mychost="@CHOST@"
++        myflags="@PLATFORM_CFLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
++        ;;
+     esac
+     myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+ 
+--- /dev/null	2018-03-05 07:42:50.020223709 +0100
++++ b/pacman.conf.powerpc64le	2018-03-17 22:43:27.778000923 +0100
+@@ -0,0 +1,120 @@
++#
++# /etc/pacman.conf
++#
++# See the pacman.conf(5) manpage for option and repository directives
++
++#
++# GENERAL OPTIONS
++#
++[options]
++# The following paths are commented out with their default values listed.
++# If you wish to use different paths, uncomment and update the paths.
++#RootDir     = /
++#DBPath      = /var/lib/pacman/
++#CacheDir    = /var/cache/pacman/pkg/
++#LogFile     = /var/log/pacman.log
++#GPGDir      = /etc/pacman.d/gnupg/
++#HookDir     = /etc/pacman.d/hooks/
++HoldPkg     = pacman glibc
++#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
++#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
++#CleanMethod = KeepInstalled
++#UseDelta    = 0.7
++Architecture = auto
++
++# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
++#IgnorePkg   =
++#IgnoreGroup =
++
++#NoUpgrade   =
++#NoExtract   =
++
++# Misc options
++#UseSyslog
++#Color
++#TotalDownload
++CheckSpace
++#VerbosePkgLists
++
++# By default, pacman accepts packages signed by keys that its local keyring
++# trusts (see pacman-key and its man page), as well as unsigned packages.
++SigLevel    = Required DatabaseOptional
++LocalFileSigLevel = Optional
++#RemoteFileSigLevel = Required
++
++# NOTE: You must run `pacman-key --init` before first using pacman; the local
++# keyring can then be populated with the keys of all Arch/Parabola packagers
++# with `pacman-key --populate archlinux` and `pacman-key --populate parabola`.
++
++#
++# REPOSITORIES
++#   - can be defined here or included from another file
++#   - pacman will search repositories in the order defined here
++#   - local/custom mirrors can be added here or in separate files
++#   - repositories listed first will take precedence when packages
++#     have identical names, regardless of version number
++#   - URLs will have $repo replaced by the name of the current repo
++#   - URLs will have $arch replaced by the name of the architecture
++#
++# Repository entries are of the format:
++#       [repo-name]
++#       Server = ServerName
++#       Include = IncludePath
++#
++# The header [repo-name] is crucial - it must be present and
++# uncommented to enable the repo.
++#
++
++# The testing repositories are disabled by default. To enable, uncomment the
++# repo name header and Include lines. You can add preferred servers immediately
++# after the header, and they will be used before the default mirrors.
++
++# NOTE: Nonprism is a particular repository that aims to provide software built
++# and patched without services under global data surveillance programs like PRISM,
++# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
++
++#[nonprism-testing]
++#Include = /etc/pacman.d/mirrorlist
++
++#[nonprism]
++#Include = /etc/pacman.d/mirrorlist
++
++#[libre-testing]
++#Include = /etc/pacman.d/mirrorlist
++
++[libre]
++Include = /etc/pacman.d/mirrorlist
++
++#[testing]
++#Include = /etc/pacman.d/mirrorlist
++
++[core]
++Include = /etc/pacman.d/mirrorlist
++
++[extra]
++Include = /etc/pacman.d/mirrorlist
++
++#[community-testing]
++#Include = /etc/pacman.d/mirrorlist
++
++[community]
++Include = /etc/pacman.d/mirrorlist
++
++# The PCR (Parabola Community Repository) contains packages maintained by trusted
++# members of the Parabola community. It also contains packages maintained by
++# Parabola developers, but that the developer decided didn't belong in core/libre.
++
++#[pcr-testing]
++#Include = /etc/pacman.d/mirrorlist
++
++[pcr]
++Include = /etc/pacman.d/mirrorlist
++
++# Parabola also supports another community projects and personal repositories, to
++# find them check out this wiki page: https://wiki.parabola.nu/Repositories
++
++# An example of a custom package repository.  See the pacman manpage for
++# tips on creating your own repositories.
++#[custom]
++#SigLevel = Optional TrustAll
++#Server = file:///home/custompkgs
diff --git a/src/stage4/patches/filesystem.patch b/src/stage4/patches/riscv64/filesystem.patch
index 130c763..130c763 100644
--- a/src/stage4/patches/filesystem.patch
+++ b/src/stage4/patches/riscv64/filesystem.patch
diff --git a/src/stage4/patches/gc.patch b/src/stage4/patches/riscv64/gc.patch
index 0db562a..0db562a 100644
--- a/src/stage4/patches/gc.patch
+++ b/src/stage4/patches/riscv64/gc.patch
diff --git a/src/stage4/patches/gstreamer.patch b/src/stage4/patches/riscv64/gstreamer.patch
index c82fa6a..c82fa6a 100644
--- a/src/stage4/patches/gstreamer.patch
+++ b/src/stage4/patches/riscv64/gstreamer.patch
diff --git a/src/stage4/patches/jemalloc.patch b/src/stage4/patches/riscv64/jemalloc.patch
index ed27524..ed27524 100644
--- a/src/stage4/patches/jemalloc.patch
+++ b/src/stage4/patches/riscv64/jemalloc.patch
diff --git a/src/stage4/patches/js.patch b/src/stage4/patches/riscv64/js.patch
index 3501657..3501657 100644
--- a/src/stage4/patches/js.patch
+++ b/src/stage4/patches/riscv64/js.patch
diff --git a/src/stage4/patches/libaio.patch b/src/stage4/patches/riscv64/libaio.patch
index 2c07294..2c07294 100644
--- a/src/stage4/patches/libaio.patch
+++ b/src/stage4/patches/riscv64/libaio.patch
diff --git a/src/stage4/patches/libatomic_ops.patch b/src/stage4/patches/riscv64/libatomic_ops.patch
index dc8157f..dc8157f 100644
--- a/src/stage4/patches/libatomic_ops.patch
+++ b/src/stage4/patches/riscv64/libatomic_ops.patch
diff --git a/src/stage4/patches/libfbclient.patch b/src/stage4/patches/riscv64/libfbclient.patch
index d4c6c38..d4c6c38 100644
--- a/src/stage4/patches/libfbclient.patch
+++ b/src/stage4/patches/riscv64/libfbclient.patch
diff --git a/src/stage4/patches/libffi.patch b/src/stage4/patches/riscv64/libffi.patch
index a37d526..a37d526 100644
--- a/src/stage4/patches/libffi.patch
+++ b/src/stage4/patches/riscv64/libffi.patch
diff --git a/src/stage4/patches/libseccomp.patch b/src/stage4/patches/riscv64/libseccomp.patch
index aafe729..aafe729 100644
--- a/src/stage4/patches/libseccomp.patch
+++ b/src/stage4/patches/riscv64/libseccomp.patch
diff --git a/src/stage4/patches/linux-libre.patch b/src/stage4/patches/riscv64/linux-libre.patch
index 69cad26..69cad26 100644
--- a/src/stage4/patches/linux-libre.patch
+++ b/src/stage4/patches/riscv64/linux-libre.patch
diff --git a/src/stage4/patches/llvm.patch b/src/stage4/patches/riscv64/llvm.patch
index d94bd6f..d94bd6f 100644
--- a/src/stage4/patches/llvm.patch
+++ b/src/stage4/patches/riscv64/llvm.patch
diff --git a/src/stage4/patches/mariadb.patch b/src/stage4/patches/riscv64/mariadb.patch
index 93a2e8a..93a2e8a 100644
--- a/src/stage4/patches/mariadb.patch
+++ b/src/stage4/patches/riscv64/mariadb.patch
diff --git a/src/stage4/patches/mesa.patch b/src/stage4/patches/riscv64/mesa.patch
index 8e6cd33..8e6cd33 100644
--- a/src/stage4/patches/mesa.patch
+++ b/src/stage4/patches/riscv64/mesa.patch
diff --git a/src/stage4/patches/nspr.patch b/src/stage4/patches/riscv64/nspr.patch
index b8332a0..b8332a0 100644
--- a/src/stage4/patches/nspr.patch
+++ b/src/stage4/patches/riscv64/nspr.patch
diff --git a/src/stage4/patches/nss.patch b/src/stage4/patches/riscv64/nss.patch
index a60e0e2..a60e0e2 100644
--- a/src/stage4/patches/nss.patch
+++ b/src/stage4/patches/riscv64/nss.patch
diff --git a/src/stage4/patches/ocaml.patch b/src/stage4/patches/riscv64/ocaml.patch
index e050b64..e050b64 100644
--- a/src/stage4/patches/ocaml.patch
+++ b/src/stage4/patches/riscv64/ocaml.patch
diff --git a/src/stage4/patches/opencv.patch b/src/stage4/patches/riscv64/opencv.patch
index db50750..db50750 100644
--- a/src/stage4/patches/opencv.patch
+++ b/src/stage4/patches/riscv64/opencv.patch
diff --git a/src/stage4/patches/openssl-1.0.patch b/src/stage4/patches/riscv64/openssl-1.0.patch
index 7f2b7e6..7f2b7e6 100644
--- a/src/stage4/patches/openssl-1.0.patch
+++ b/src/stage4/patches/riscv64/openssl-1.0.patch
diff --git a/src/stage4/patches/openssl.patch b/src/stage4/patches/riscv64/openssl.patch
index e930372..e930372 100644
--- a/src/stage4/patches/openssl.patch
+++ b/src/stage4/patches/riscv64/openssl.patch
diff --git a/src/stage4/patches/pacman.patch b/src/stage4/patches/riscv64/pacman.patch
index b702ddf..b702ddf 100644
--- a/src/stage4/patches/pacman.patch
+++ b/src/stage4/patches/riscv64/pacman.patch
diff --git a/src/stage4/patches/pcre.patch b/src/stage4/patches/riscv64/pcre.patch
index 8124d1a..8124d1a 100644
--- a/src/stage4/patches/pcre.patch
+++ b/src/stage4/patches/riscv64/pcre.patch
diff --git a/src/stage4/patches/pcre2.patch b/src/stage4/patches/riscv64/pcre2.patch
index d7a782f..d7a782f 100644
--- a/src/stage4/patches/pcre2.patch
+++ b/src/stage4/patches/riscv64/pcre2.patch
diff --git a/src/stage4/patches/postgresql.patch b/src/stage4/patches/riscv64/postgresql.patch
index ff8c00e..ff8c00e 100644
--- a/src/stage4/patches/postgresql.patch
+++ b/src/stage4/patches/riscv64/postgresql.patch
diff --git a/src/stage4/patches/python-numpy.patch b/src/stage4/patches/riscv64/python-numpy.patch
index 2b249b7..2b249b7 100644
--- a/src/stage4/patches/python-numpy.patch
+++ b/src/stage4/patches/riscv64/python-numpy.patch
diff --git a/src/stage4/patches/qt4.patch b/src/stage4/patches/riscv64/qt4.patch
index 0579794..0579794 100644
--- a/src/stage4/patches/qt4.patch
+++ b/src/stage4/patches/riscv64/qt4.patch
diff --git a/src/stage4/patches/qt5-webkit.patch b/src/stage4/patches/riscv64/qt5-webkit.patch
index a6e7316..a6e7316 100644
--- a/src/stage4/patches/qt5-webkit.patch
+++ b/src/stage4/patches/riscv64/qt5-webkit.patch
diff --git a/src/stage4/patches/webkit2gtk.patch b/src/stage4/patches/riscv64/webkit2gtk.patch
index c8ea468..c8ea468 100644
--- a/src/stage4/patches/webkit2gtk.patch
+++ b/src/stage4/patches/riscv64/webkit2gtk.patch
diff --git a/src/stage4/patches/webrtc-audio-processing.patch b/src/stage4/patches/riscv64/webrtc-audio-processing.patch
index ca9977d..ca9977d 100644
--- a/src/stage4/patches/webrtc-audio-processing.patch
+++ b/src/stage4/patches/riscv64/webrtc-audio-processing.patch
diff --git a/src/stage4/patches/zstd.patch b/src/stage4/patches/riscv64/zstd.patch
index bab7b1b..bab7b1b 100644
--- a/src/stage4/patches/zstd.patch
+++ b/src/stage4/patches/riscv64/zstd.patch
diff --git a/src/stage4/patches/texlive-bin.patch.texlive-bin b/src/stage4/patches/texlive-bin.patch.texlive-bin
deleted file mode 100644
index 80a5e83..0000000
--- a/src/stage4/patches/texlive-bin.patch.texlive-bin
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-11 06:12:11.168229069 +0200
-+++ b/PKGBUILD	2018-04-11 06:12:11.169229069 +0200
-@@ -9,18 +9,15 @@
- # parabola changes and rationale:
- #  - rebranded to parabola
- 
--pkgname=('texlive-bin')
-+pkgname=('texlive-bin' 'libsynctex')
- pkgver=2017.44590
- pkgrel=13
--pkgrel+=.parabola1
- license=('GPL')
- arch=('x86_64')
--arch+=('i686' 'armv7h')
- makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
-          'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
-          'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
--         'perl' 'clisp' 'ffcall')
--makedepends+=('poppler=0.63.0' 'icu>=61' 'icu<62')
-+         'perl')
- url='http://tug.org/texlive/'
- source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
-         "luatex-gcc7.patch"
-@@ -52,12 +49,6 @@ prepare() {
- build() {
-    cd "$srcdir"
- 
--   if [ "${CARCH}" = "armv7h" ]; then
--     local config_xindy="--disable-xindy"
--   else
--     local config_xindy="--enable-xindy"
--   fi
--
-    #############################################################
-    ### configure
-    cd source
-@@ -105,8 +96,7 @@ build() {
-      --disable-dump-share \
-      --disable-aleph \
-      --enable-luatex \
--     --with-clisp-runtime=default \
--     --disable-xindy-rules --disable-xindy-docs "$config_xindy"
-+     --disable-xindy --disable-luajittex --disable-mfluajit
-    #############################################################
-    ### make
-    echo "-------------------------------------------------------"
-@@ -115,6 +105,15 @@ build() {
-    make
- }
- 
-+package_libsynctex() {
-+    pkgdesc='Library for synchronization between TeX files and resulting file'
-+    depends=('glibc' 'zlib')
-+
-+    cd "${srcdir}/source/Work"
-+    make -C texk/web2c DESTDIR="${pkgdir}" \
-+        install-data-am install-libLTLIBRARIES
-+}
-+
- package_texlive-bin() {
-    pkgdesc="TeX Live binaries"
-    pkgdesc+=" (Parabola rebranded)"
-@@ -122,8 +121,7 @@ package_texlive-bin() {
-             'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
-             'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
-             'libsynctex')
--   depends+=('icu>=61' 'icu<62' 'poppler=0.63.0')
--   provides=('lcdf-typetools' 'kpathsea' 'xindy')
-+   provides=('lcdf-typetools' 'kpathsea')
-    optdepends=('ed: for texconfig'
-                'biber: for bibliography processing')
-    options=('!strip')
-@@ -133,8 +131,6 @@ package_texlive-bin() {
-    #############################################################
-    ### install
-    cd source
--   # fixes for xindy
--   find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
- 
-    echo "-------------------------------------------------------"
-    echo "--> Proceeding with make install ..."
-@@ -307,7 +303,6 @@ texdoc
- texdoctk
- texexec
- texfot
--texindy
- texlinks
- texliveonfly
- texloganalyser
-@@ -323,11 +318,7 @@ updmap-user
- vpl2ovp
- vpl2vpl
- xhlatex
--xindy
- "
--   if [ "$CARCH" = "armv7h" ]; then
--     _core_scripts="$(echo "$_core_scripts" | sed '/xindy$/d')"
--   fi
-    _games_scripts="rubikrotation"
-    _humanities_scripts="diadia"
-    _langcyrillic_scripts="rubibtex rumakeindex"
diff --git a/src/stage4/stage4.sh b/src/stage4/stage4.sh
index 6423757..01a8f59 100644
--- a/src/stage4/stage4.sh
+++ b/src/stage4/stage4.sh
@@ -33,7 +33,8 @@ stage4_makepkg() {
   package_import_keys "$pkgname" || return
 
   # substitute common variables
-  sed "s#@MULTILIB@#${MULTILIB:-disable}#g" \
+  sed "s#@MULTILIB@#${MULTILIB:-disable}#g; \
+       s#@GCC_CONFIG_FLAGS@#${GCC_CONFIG_FLAGS[*]}#g" \
     PKGBUILD.in > PKGBUILD
 
   # prepare the pkgbuild
@@ -70,7 +71,7 @@ stage4_makepkg() {
     run pacman -Scc || return
 
   # build the package
-  "$BUILDDIR/libremakepkg-$CARCH.sh" -n "$CHOST"-stage4 || return
+  "$BUILDDIR/libremakepkg.sh" -n "$CHOST"-stage4 || return
 }
 
 stage4_package_build() {