diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2018-06-22 09:31:53 +0200 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2018-06-22 09:31:53 +0200 |
commit | a5fd90dcce72f58af61880857d7ab0f2e44e9874 (patch) | |
tree | 727048402665b287675825a6d95a81fd356a18ab /src/stage3/patches | |
parent | 56ec7e46cbdd2f7319574710d3ce3d38b9338108 (diff) |
rebootstrapped powerpc64le toolchain with multilib, and added grub
Diffstat (limited to 'src/stage3/patches')
-rw-r--r-- | src/stage3/patches/generic/binutils.patch | 31 | ||||
-rw-r--r-- | src/stage3/patches/generic/gcc.patch | 26 | ||||
-rw-r--r-- | src/stage3/patches/generic/glibc.patch | 39 | ||||
-rw-r--r-- | src/stage3/patches/powerpc64le/binutils.patch | 13 |
4 files changed, 67 insertions, 42 deletions
diff --git a/src/stage3/patches/generic/binutils.patch b/src/stage3/patches/generic/binutils.patch deleted file mode 100644 index 893089d..0000000 --- a/src/stage3/patches/generic/binutils.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-05-28 16:39:38.041700185 +0200 -+++ b/PKGBUILD 2018-05-28 16:44:11.358369579 +0200 -@@ -20,13 +20,15 @@ options=(staticlibs !distcc !ccache) - source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig} - 0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch - 0002-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch -- 0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch) -+ 0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch -+ https://raw.githubusercontent.com/archlinux32/packages/master/core/binutils/binutils-2.30-branch.patch) - validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F) - md5sums=('ffc476dd46c96f932875d1b2e27e929f' - 'SKIP' - '469164f3c93a0e92a697537b60c9806c' - '0c679b37e90fb23de60a4d28329b956a' -- '53b5682e09c0a27e9994c3efdfe01d29') -+ '53b5682e09c0a27e9994c3efdfe01d29' -+ 'a5ba9fc9de327b2eff071e19429c6e67') - - prepare() { - mkdir -p binutils-build -@@ -43,8 +45,7 @@ prepare() { - # https://sourceware.org/bugzilla/show_bug.cgi?id=22829 - patch -p1 -i "$srcdir/0002-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch" - -- # https://sourceware.org/bugzilla/show_bug.cgi?id=22836 -- patch -p1 -i "$srcdir/0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch" -+ patch -p1 -i "$srcdir/binutils-2.30-branch.patch" - } - - build() { diff --git a/src/stage3/patches/generic/gcc.patch b/src/stage3/patches/generic/gcc.patch index 1b88c31..575521d 100644 --- a/src/stage3/patches/generic/gcc.patch +++ b/src/stage3/patches/generic/gcc.patch @@ -14,8 +14,8 @@ diff -rupN a/0001-pthread-reentrant.patch b/0001-pthread-reentrant.patch + -melf" XLEN_SPEC "lriscv \ + %{shared} \ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-05-26 12:05:20.233145125 +0200 -+++ b/PKGBUILD 2018-05-26 12:56:33.449842456 +0200 +--- a/PKGBUILD 2018-06-20 10:31:33.911307893 +0200 ++++ b/PKGBUILD 2018-06-20 20:05:11.994984639 +0200 @@ -5,8 +5,9 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version @@ -220,3 +220,25 @@ diff -rupN a/PKGBUILD b/PKGBUILD install-{toolexeclibDATA,nodist_fincludeHEADERS} make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info} +@@ -365,20 +346,12 @@ package_lib32-gcc-libs() { + + for lib in libatomic \ + libgfortran \ +- libgo \ + libgomp \ +- libitm \ + libquadmath \ +- libsanitizer/{a,l,ub}san \ +- libstdc++-v3/src \ +- libvtv; do ++ 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 + diff --git a/src/stage3/patches/generic/glibc.patch b/src/stage3/patches/generic/glibc.patch index ca64f4c..4531ac5 100644 --- a/src/stage3/patches/generic/glibc.patch +++ b/src/stage3/patches/generic/glibc.patch @@ -1,7 +1,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-06-10 02:55:37.495747371 +0200 -+++ b/PKGBUILD 2018-06-10 08:10:22.642602471 +0200 -@@ -6,13 +6,15 @@ +--- a/PKGBUILD 2018-06-18 09:36:19.679550645 +0200 ++++ b/PKGBUILD 2018-06-19 15:05:54.550610043 +0200 +@@ -6,13 +6,14 @@ # NOTE: valgrind requires rebuilt with each major glibc version pkgbase=glibc @@ -14,12 +14,11 @@ diff -rupN a/PKGBUILD b/PKGBUILD url='http://www.gnu.org/software/libc' license=(GPL LGPL) -makedepends=(git gd lib32-gcc-libs) -+makedepends=(git gd) +[ "x@MULTILIB@" != "xenable" ] || makedepends+=(lib32-gcc-libs) options=(!strip staticlibs) _commit=23158b08a0908f381459f273a984c6fd328363cb #source=(git+https://sourceware.org/git/glibc.git#commit=$_commit -@@ -53,10 +55,10 @@ build() { +@@ -53,10 +54,10 @@ build() { --enable-add-ons --enable-bind-now --enable-lock-elision @@ -32,7 +31,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD --disable-profile --disable-werror ) -@@ -70,6 +70,8 @@ build() { +@@ -70,6 +71,8 @@ build() { # remove fortify for building libraries CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} @@ -41,12 +40,34 @@ diff -rupN a/PKGBUILD b/PKGBUILD "$srcdir/glibc/configure" \ --libdir=/usr/lib \ -@@ -87,6 +89,8 @@ build() { +@@ -87,9 +90,11 @@ build() { echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms make + [ "x@MULTILIB@" == "xenable" ] || return 0 + cd "$srcdir/lib32-glibc-build" - export CC="gcc -m32 -mstackrealign" - export CXX="g++ -m32 -mstackrealign" +- export CC="gcc -m32 -mstackrealign" +- export CXX="g++ -m32 -mstackrealign" ++ export CC="gcc @PLATFORM32_CFLAGS@" ++ export CXX="g++ @PLATFORM32_CFLAGS@" + + echo "slibdir=/usr/lib32" >> configparms + echo "rtlddir=/usr/lib32" >> configparms +@@ -102,7 +107,7 @@ build() { + CXXFLAGS=${CXXFLAGS/-fno-plt/} + + "$srcdir/glibc/configure" \ +- --host=i686-pc-linux-gnu \ ++ --host=@CHOST32@ \ + --libdir=/usr/lib32 \ + --libexecdir=/usr/lib32 \ + ${_configure_flags[@]} +@@ -117,7 +122,6 @@ build() { + echo "CC += -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms + make +- + } + + check() { diff --git a/src/stage3/patches/powerpc64le/binutils.patch b/src/stage3/patches/powerpc64le/binutils.patch new file mode 100644 index 0000000..b85c25c --- /dev/null +++ b/src/stage3/patches/powerpc64le/binutils.patch @@ -0,0 +1,13 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-18 09:36:34.209550790 +0200 ++++ b/PKGBUILD 2018-06-20 08:01:20.661217960 +0200 +@@ -61,7 +61,8 @@ build() { + --enable-plugins \ + --enable-relro \ + --enable-shared \ +- --enable-targets=x86_64-pep \ ++ --enable-targets=spu \ ++ --enable-targets=powerpc-linux \ + --enable-threads \ + --disable-gdb \ + --disable-werror \ |