From 696057ad6ec8fb2ceb908e991cab5e2c2b49f683 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Mon, 11 Feb 2019 13:49:44 -0300 Subject: [PATCH] binutils upgraded to version 2.32 --- patches/binutils/136_bfd_pic.patch | 4 ++-- recipes/devel/binutils/recipe | 9 +++++---- sources/SOURCELIST.txt | 2 +- sources/binutils-2.31.1.tar.lz.sha256 | 1 - sources/binutils-2.32.tar.lz.sha256 | 1 + stages/0/01-binutils | 6 +++--- stages/1/04-binutils | 11 +++++++---- 7 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 sources/binutils-2.31.1.tar.lz.sha256 create mode 100644 sources/binutils-2.32.tar.lz.sha256 diff --git a/patches/binutils/136_bfd_pic.patch b/patches/binutils/136_bfd_pic.patch index 7c66fbaf..3ef0f2d6 100644 --- a/patches/binutils/136_bfd_pic.patch +++ b/patches/binutils/136_bfd_pic.patch @@ -5,7 +5,7 @@ Index: b/bfd/Makefile.am =================================================================== --- a/bfd/Makefile.am +++ b/bfd/Makefile.am -@@ -51,7 +51,7 @@ ZLIBINC = @zlibinc@ +@@ -52,7 +52,7 @@ ZLIBINC = @zlibinc@ WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ @@ -18,7 +18,7 @@ Index: b/bfd/Makefile.in =================================================================== --- a/bfd/Makefile.in +++ b/bfd/Makefile.in -@@ -475,7 +475,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel +@@ -478,7 +478,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel # case both are empty. ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ diff --git a/recipes/devel/binutils/recipe b/recipes/devel/binutils/recipe index f75db8f8..89a071d2 100644 --- a/recipes/devel/binutils/recipe +++ b/recipes/devel/binutils/recipe @@ -1,6 +1,6 @@ # Build recipe for binutils. # -# Copyright (c) 2015-2018 Matias Fonzo, . +# Copyright (c) 2015-2019 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,8 +15,8 @@ # limitations under the License. program=binutils -version=2.31.1 -release=4 +version=2.32 +release=1 # Set 'outdir' for a nice and well-organized output directory outdir="${outdir}/${arch}/devel" @@ -57,7 +57,7 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - patch -Np1 -i "${worktree}/patches/binutils/branch-updates.diff" + #patch -Np1 -i "${worktree}/patches/binutils/branch-updates.diff" patch -Np1 -i "${worktree}/patches/binutils/136_bfd_pic.patch" # Create a separate build directory @@ -88,6 +88,7 @@ build() --enable-64-bit-bfd \ --enable-targets=i386-efi-pe,x86_64-pep \ --enable-install-libiberty \ + --enable-initfini-array \ --disable-werror \ --disable-compressed-debug-sections \ --with-system-zlib \ diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index 587f5d68..e541afcf 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -108,7 +108,7 @@ http://ftp.gnome.org/pub/gnome/sources/pango/1.42/pango-1.42.4.tar.xz http://ftp.gnome.org/pub/gnome/sources/vala/0.42/vala-0.42.3.tar.xz http://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.gz http://ftp.gnu.org/gnu/bc/bc-1.07.1.tar.gz -http://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.lz +http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.lz http://ftp.gnu.org/gnu/bison/bison-3.3.2.tar.gz http://ftp.gnu.org/gnu/diffutils/diffutils-3.7.tar.xz http://ftp.gnu.org/gnu/ed/ed-1.15.tar.lz diff --git a/sources/binutils-2.31.1.tar.lz.sha256 b/sources/binutils-2.31.1.tar.lz.sha256 deleted file mode 100644 index a67112c8..00000000 --- a/sources/binutils-2.31.1.tar.lz.sha256 +++ /dev/null @@ -1 +0,0 @@ -87eaf3c79514bc286ddc6c2fc7388ce2adaf5dd850894a7afc5791a84e661331 binutils-2.31.1.tar.lz diff --git a/sources/binutils-2.32.tar.lz.sha256 b/sources/binutils-2.32.tar.lz.sha256 new file mode 100644 index 00000000..b88fa6d6 --- /dev/null +++ b/sources/binutils-2.32.tar.lz.sha256 @@ -0,0 +1 @@ +1136b65c80859a715f32a6aaebc8c70aa427e5a0d53b49476c8cbca31c5c9241 binutils-2.32.tar.lz diff --git a/stages/0/01-binutils b/stages/0/01-binutils index 972fd15e..4428783b 100755 --- a/stages/0/01-binutils +++ b/stages/0/01-binutils @@ -1,6 +1,6 @@ # Build script for binutils. # -# Copyright (c) 2014-2018 Matias Fonzo, . +# Copyright (c) 2014-2019 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=2.31.1 +version=2.32 cd -- "$TMPDIR" rm -rf binutils-${version} @@ -23,7 +23,7 @@ unpack "${worktree}/sources/binutils-${version}.tar.lz" # Build instructions cd binutils-${version} -patch -Np1 -i "${worktree}/patches/binutils/branch-updates.diff" +#patch -Np1 -i "${worktree}/patches/binutils/branch-updates.diff" patch -Np1 -i "${worktree}/patches/binutils/136_bfd_pic.patch" # Build in a separate directory diff --git a/stages/1/04-binutils b/stages/1/04-binutils index 3afd19da..3658d659 100755 --- a/stages/1/04-binutils +++ b/stages/1/04-binutils @@ -1,6 +1,6 @@ # Build script for binutils. # -# Copyright (c) 2014-2018 Matias Fonzo, . +# Copyright (c) 2014-2019 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=2.31.1 +version=2.32 cd -- "$TMPDIR" rm -rf binutils-${version} @@ -23,7 +23,7 @@ unpack "${worktree}/sources/binutils-${version}.tar.lz" # Build instructions cd binutils-${version} -patch -Np1 -i "${worktree}/patches/binutils/branch-updates.diff" +#patch -Np1 -i "${worktree}/patches/binutils/branch-updates.diff" patch -Np1 -i "${worktree}/patches/binutils/136_bfd_pic.patch" # Build in a separate directory @@ -44,7 +44,10 @@ CFLAGS="$BTCFLAGS" CXXFLAGS="$BTCXXFLAGS" LDFLAGS="$BTLDFLAGS" \ --host=$target \ --target=$target \ --enable-deterministic-archives \ + --enable-relro \ + --enable-threads \ --enable-64-bit-bfd \ + --enable-initfini-array \ --disable-compressed-debug-sections \ --disable-nls \ --disable-werror \ @@ -57,7 +60,7 @@ make -j${jobs} MAKEINFO="true" make -j${jobs} MAKEINFO="true" install # Make a new ld(1) containing another search path, -# this is handled by 16-toolchain (called from musl's recipe) +# this is handled by "20-toolchain" (called from musl's recipe) make -C ld clean make -C ld LIB_PATH=/usr/lib${libSuffix}:/lib cp -f ld/ld-new /tools/bin -- 2.11.4.GIT