mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-16 18:01:09 +02:00
sys-devel/binutils: Sync with Gentoo
It's from Gentoo commit 61ad3909ac0e6fdf0e61e5124418bb36a5dcb1a1.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
c150809c43
commit
c27dac22a9
@ -22,6 +22,7 @@ DIST binutils-2.42-patches-6.tar.xz 50664 BLAKE2B f13b65a761cfba80caf2e4740c6383
|
|||||||
DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
|
DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
|
||||||
DIST binutils-2.43-patches-3.tar.xz 62692 BLAKE2B a189a01a6a99c4fdff124cf90ecc18f874812c17fc735376c855469c487b6a71489ad5c2f86c518d2e029cc83d65757144ff9abddbe7ec3fc06e22f9501c62f4 SHA512 99a30e18fdfd7bdce85bb903f8d61837cfbb639ead8a680ff1a85ad1d615b658e696bdf196c4a002d029f952d34aa441e09e861b22f5400c65f07cce5934cd8f
|
DIST binutils-2.43-patches-3.tar.xz 62692 BLAKE2B a189a01a6a99c4fdff124cf90ecc18f874812c17fc735376c855469c487b6a71489ad5c2f86c518d2e029cc83d65757144ff9abddbe7ec3fc06e22f9501c62f4 SHA512 99a30e18fdfd7bdce85bb903f8d61837cfbb639ead8a680ff1a85ad1d615b658e696bdf196c4a002d029f952d34aa441e09e861b22f5400c65f07cce5934cd8f
|
||||||
DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb
|
DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb
|
||||||
DIST binutils-2.44-patches-1.tar.xz 9156 BLAKE2B c72a7d0ffdb852f8de9c18e187b5768085b3a070744a4fadef508ab0e865d3a3967ec12a0ee7a325b6b689f39e5243aacd9d3f73ceb723d53592ec6ca640161b SHA512 053de98536e92837d0a08fac26bb0f057431747fe6e82f8b9ac54dd9aed65d8de379d653c0e8a8cd31267b9769825a420db5f40957f8c4eb54a7e4a9d76fadb8
|
|
||||||
DIST binutils-2.44-patches-4.tar.xz 83612 BLAKE2B caa71849dbbfe1181072c84985c786284f5111bbaa638a44e828c6cc4c19e005793d045dc116c772cf7ffed4898f6f6c935d04f94a76c26e59fb3c4f5adf03d1 SHA512 4dd8e6c36a0423ab29a1f4b227c90a05eb61cab380c809a2f49bba27e84d621e6a5eefe4ec510a7c1c60ba93720f92159ac477c02f9e720e1bbcd6aaf6097d26
|
DIST binutils-2.44-patches-4.tar.xz 83612 BLAKE2B caa71849dbbfe1181072c84985c786284f5111bbaa638a44e828c6cc4c19e005793d045dc116c772cf7ffed4898f6f6c935d04f94a76c26e59fb3c4f5adf03d1 SHA512 4dd8e6c36a0423ab29a1f4b227c90a05eb61cab380c809a2f49bba27e84d621e6a5eefe4ec510a7c1c60ba93720f92159ac477c02f9e720e1bbcd6aaf6097d26
|
||||||
DIST binutils-2.44.tar.xz 27285788 BLAKE2B 0eb031ace9fb5a7047b81b5a05b1760f7d332c8ed67f98899f153a45f181b83e661a484551af05c0a9b2adc422da84619103c7b1f3c9fad5327872832b5446aa SHA512 b85d3bbc0e334cf67a96219d3c7c65fbf3e832b2c98a7417bf131f3645a0307057ec81cd2b29ff2563cec53e3d42f73e2c60cc5708e80d4a730efdcc6ae14ad7
|
DIST binutils-2.44.tar.xz 27285788 BLAKE2B 0eb031ace9fb5a7047b81b5a05b1760f7d332c8ed67f98899f153a45f181b83e661a484551af05c0a9b2adc422da84619103c7b1f3c9fad5327872832b5446aa SHA512 b85d3bbc0e334cf67a96219d3c7c65fbf3e832b2c98a7417bf131f3645a0307057ec81cd2b29ff2563cec53e3d42f73e2c60cc5708e80d4a730efdcc6ae14ad7
|
||||||
|
DIST binutils-2.45-patches-1.tar.xz 15588 BLAKE2B b88c62a6483807dfb24c97c534aadc1f930ea2d6cd8ad86734c40458a0e3ac4d149c0ee47c6ba541c462ce0e619dfaa5328c3dd5ffbd94511c487956866c7a38 SHA512 05c890a71d465539b3d066c2fd92930e4d6c9003147395a4c2cb9cc514f412fa392892e2c3b8887493a56b00453ac383612d0cac42e4cacce983e65886537149
|
||||||
|
DIST binutils-2.45.tar.xz 27868232 BLAKE2B 1ce72346b1f531c89feb86b407e2c649151b506ffbd1a02d413411d36f7ede98fa9a1adf75dd941c01df5fe7e6bf151828b269eeb7c278315ca8004bff22eb7f SHA512 c7b10a7466d9fd398d7a0b3f2a43318432668d714f2ec70069a31bdc93c86d28e0fe83792195727167743707fbae45337c0873a0786416db53bbf22860c16ce7
|
||||||
|
|||||||
@ -1,571 +0,0 @@
|
|||||||
# Copyright 1999-2025 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="Tools necessary to build programs"
|
|
||||||
HOMEPAGE="https://sourceware.org/binutils/"
|
|
||||||
|
|
||||||
LICENSE="GPL-3+"
|
|
||||||
IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins static-libs test vanilla zstd"
|
|
||||||
|
|
||||||
# Variables that can be set here (ignored for live ebuilds)
|
|
||||||
# PATCH_VER - the patchset version
|
|
||||||
# Default: empty, no patching
|
|
||||||
# PATCH_BINUTILS_VER - the binutils version in the patchset name
|
|
||||||
# - Default: PV
|
|
||||||
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
|
|
||||||
# for the patchsets
|
|
||||||
|
|
||||||
PATCH_VER=1
|
|
||||||
PATCH_DEV=dilfridge
|
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]]; then
|
|
||||||
inherit git-r3
|
|
||||||
SLOT=${PV}
|
|
||||||
elif [[ ${PV} == *9999 ]]; then
|
|
||||||
inherit git-r3
|
|
||||||
SLOT=$(ver_cut 1-2)
|
|
||||||
else
|
|
||||||
PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
|
|
||||||
PATCH_DEV=${PATCH_DEV:-dilfridge}
|
|
||||||
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
|
|
||||||
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
|
||||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
|
||||||
SLOT=$(ver_cut 1-2)
|
|
||||||
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# The cross-compile logic
|
|
||||||
#
|
|
||||||
export CTARGET=${CTARGET:-${CHOST}}
|
|
||||||
if [[ ${CTARGET} == ${CHOST} ]] ; then
|
|
||||||
if [[ ${CATEGORY} == cross-* ]] ; then
|
|
||||||
export CTARGET=${CATEGORY#cross-}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
|
|
||||||
|
|
||||||
#
|
|
||||||
# The dependencies
|
|
||||||
#
|
|
||||||
RDEPEND="
|
|
||||||
>=sys-devel/binutils-config-3
|
|
||||||
sys-libs/zlib
|
|
||||||
debuginfod? (
|
|
||||||
dev-libs/elfutils[debuginfod(-)]
|
|
||||||
)
|
|
||||||
zstd? ( app-arch/zstd:= )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
doc? ( sys-apps/texinfo )
|
|
||||||
pgo? (
|
|
||||||
dev-util/dejagnu
|
|
||||||
app-alternatives/bc
|
|
||||||
)
|
|
||||||
test? (
|
|
||||||
dev-util/dejagnu
|
|
||||||
app-alternatives/bc
|
|
||||||
)
|
|
||||||
nls? ( sys-devel/gettext )
|
|
||||||
zstd? ( virtual/pkgconfig )
|
|
||||||
app-alternatives/lex
|
|
||||||
app-alternatives/yacc
|
|
||||||
"
|
|
||||||
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
MY_BUILDDIR=${WORKDIR}/build
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == *9999 ]] ; then
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git
|
|
||||||
https://github.com/gentoo/binutils-patches
|
|
||||||
"
|
|
||||||
EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
|
|
||||||
git-r3_src_unpack
|
|
||||||
mv patches-git/9999 patch || die
|
|
||||||
|
|
||||||
if [[ ${PV} != 9999 ]] ; then
|
|
||||||
EGIT_BRANCH=binutils-$(ver_cut 1)_$(ver_cut 2)-branch
|
|
||||||
fi
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
https://sourceware.org/git/binutils-gdb.git
|
|
||||||
https://git.sr.ht/~sourceware/binutils-gdb
|
|
||||||
https://gitlab.com/x86-binutils/binutils-gdb.git
|
|
||||||
"
|
|
||||||
S=${WORKDIR}/binutils
|
|
||||||
EGIT_CHECKOUT_DIR=${S}
|
|
||||||
git-r3_src_unpack
|
|
||||||
else
|
|
||||||
unpack ${P/-hppa64/}.tar.xz
|
|
||||||
|
|
||||||
cd "${WORKDIR}" || die
|
|
||||||
unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
|
|
||||||
|
|
||||||
# _p patch versions are Gentoo specific tarballs ...
|
|
||||||
local dir=${P%_p?}
|
|
||||||
dir=${dir/-hppa64/}
|
|
||||||
|
|
||||||
S=${WORKDIR}/${dir}
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "${WORKDIR}" || die
|
|
||||||
mkdir -p "${MY_BUILDDIR}" || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
local patchsetname
|
|
||||||
if [[ ${PV} == 9999 ]] ; then
|
|
||||||
patchsetname="from git master"
|
|
||||||
elif [[ ${PV} == *9999 ]] ; then
|
|
||||||
patchsetname="from git branch ${EGIT_BRANCH}"
|
|
||||||
else
|
|
||||||
patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then
|
|
||||||
if ! use vanilla; then
|
|
||||||
einfo "Applying binutils patchset ${patchsetname}"
|
|
||||||
eapply "${WORKDIR}/patch"
|
|
||||||
einfo "Done."
|
|
||||||
|
|
||||||
# This is applied conditionally for now just out of caution.
|
|
||||||
# It should be okay on non-prefix systems though. See bug #892549.
|
|
||||||
if is_cross || use prefix; then
|
|
||||||
eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
|
|
||||||
"${FILESDIR}"/binutils-2.41-linker-prefix.patch
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Make sure our explicit libdir paths don't get clobbered, bug #562460
|
|
||||||
sed -i \
|
|
||||||
-e 's:@bfdlibdir@:@libdir@:g' \
|
|
||||||
-e 's:@bfdincludedir@:@includedir@:g' \
|
|
||||||
{bfd,opcodes}/Makefile.in || die
|
|
||||||
|
|
||||||
# Apply things from PATCHES and user dirs
|
|
||||||
default
|
|
||||||
|
|
||||||
# Run misc portage update scripts
|
|
||||||
gnuconfig_update
|
|
||||||
elibtoolize --portage --no-uclibc
|
|
||||||
}
|
|
||||||
|
|
||||||
toolchain-binutils_bugurl() {
|
|
||||||
printf "https://bugs.gentoo.org/"
|
|
||||||
}
|
|
||||||
toolchain-binutils_pkgversion() {
|
|
||||||
printf "Gentoo ${PV}"
|
|
||||||
[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
|
|
||||||
# Avoid really confusing logs from subconfigure spam, makes logs far
|
|
||||||
# more legible.
|
|
||||||
MAKEOPTS="--output-sync=line ${MAKEOPTS}"
|
|
||||||
|
|
||||||
# Setup some paths
|
|
||||||
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
|
|
||||||
INCPATH=${LIBPATH}/include
|
|
||||||
DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
|
|
||||||
if is_cross ; then
|
|
||||||
TOOLPATH=/usr/${CHOST}/${CTARGET}
|
|
||||||
else
|
|
||||||
TOOLPATH=/usr/${CTARGET}
|
|
||||||
fi
|
|
||||||
BINPATH=${TOOLPATH}/binutils-bin/${PV}
|
|
||||||
|
|
||||||
# Make sure we filter $LINGUAS so that only ones that
|
|
||||||
# actually work make it through, bug #42033
|
|
||||||
strip-linguas -u */po
|
|
||||||
|
|
||||||
# Keep things sane
|
|
||||||
strip-flags
|
|
||||||
use cet && filter-flags -mindirect-branch -mindirect-branch=*
|
|
||||||
use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
|
|
||||||
|
|
||||||
# https://sourceware.org/PR32372
|
|
||||||
append-cflags $(test-flags-CC -std=gnu17)
|
|
||||||
|
|
||||||
local x
|
|
||||||
echo
|
|
||||||
for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
|
|
||||||
einfo "$(printf '%10s' ${x}:) ${!x}"
|
|
||||||
done
|
|
||||||
echo
|
|
||||||
|
|
||||||
cd "${MY_BUILDDIR}" || die
|
|
||||||
local myconf=()
|
|
||||||
|
|
||||||
if use plugins ; then
|
|
||||||
myconf+=( --enable-plugins )
|
|
||||||
fi
|
|
||||||
# enable gold (installed as ld.gold) and ld's plugin architecture
|
|
||||||
if use gold ; then
|
|
||||||
myconf+=( --enable-gold )
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use nls ; then
|
|
||||||
myconf+=( --without-included-gettext )
|
|
||||||
else
|
|
||||||
myconf+=( --disable-nls )
|
|
||||||
fi
|
|
||||||
|
|
||||||
myconf+=( --with-system-zlib )
|
|
||||||
|
|
||||||
# For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
|
|
||||||
# logic in toolchain.eclass. bug #446946
|
|
||||||
#
|
|
||||||
# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
|
|
||||||
case $(tc-arch) in
|
|
||||||
ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
|
|
||||||
|
|
||||||
[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
|
|
||||||
|
|
||||||
is_cross && myconf+=(
|
|
||||||
--with-sysroot="${EPREFIX}"/usr/${CTARGET}
|
|
||||||
--enable-poison-system-directories
|
|
||||||
)
|
|
||||||
|
|
||||||
myconf+=( --enable-secureplt )
|
|
||||||
|
|
||||||
# mips can't do hash-style=gnu ...
|
|
||||||
if [[ $(tc-arch) != mips ]] ; then
|
|
||||||
myconf+=( --enable-default-hash-style=gnu )
|
|
||||||
fi
|
|
||||||
|
|
||||||
myconf+=(
|
|
||||||
--prefix="${EPREFIX}"/usr
|
|
||||||
--host=${CHOST}
|
|
||||||
--target=${CTARGET}
|
|
||||||
--datadir="${EPREFIX}"${DATAPATH}
|
|
||||||
--datarootdir="${EPREFIX}"${DATAPATH}
|
|
||||||
--infodir="${EPREFIX}"${DATAPATH}/info
|
|
||||||
--mandir="${EPREFIX}"${DATAPATH}/man
|
|
||||||
--bindir="${EPREFIX}"${BINPATH}
|
|
||||||
--libdir="${EPREFIX}"${LIBPATH}
|
|
||||||
--libexecdir="${EPREFIX}"${LIBPATH}
|
|
||||||
--includedir="${EPREFIX}"${INCPATH}
|
|
||||||
# portage's econf() does not detect presence of --d-d-t
|
|
||||||
# because it greps only top-level ./configure. But not
|
|
||||||
# libiberty's or bfd's configure.
|
|
||||||
--disable-dependency-tracking
|
|
||||||
--disable-silent-rules
|
|
||||||
--enable-obsolete
|
|
||||||
--enable-shared
|
|
||||||
--enable-threads
|
|
||||||
--enable-relro
|
|
||||||
--enable-install-libiberty
|
|
||||||
--enable-textrel-check=$(usex hardened error warning)
|
|
||||||
# Things to think about
|
|
||||||
#--enable-deterministic-archives
|
|
||||||
--enable-new-dtags
|
|
||||||
--disable-jansson
|
|
||||||
--disable-werror
|
|
||||||
--with-bugurl="$(toolchain-binutils_bugurl)"
|
|
||||||
--with-pkgversion="$(toolchain-binutils_pkgversion)"
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
$(use_with zstd)
|
|
||||||
|
|
||||||
# Disable modules that are in a combined binutils/gdb tree, bug #490566
|
|
||||||
--disable-{gdb,gdbserver,libbacktrace,libdecnumber,readline,sim}
|
|
||||||
# Strip out broken static link flags: https://gcc.gnu.org/PR56750
|
|
||||||
--without-stage1-ldflags
|
|
||||||
# Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100
|
|
||||||
--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
|
|
||||||
|
|
||||||
$(use_with debuginfod)
|
|
||||||
|
|
||||||
# Avoid automagic dev-libs/msgpack dep, bug #865875
|
|
||||||
--without-msgpack
|
|
||||||
|
|
||||||
# Allow user to opt into CET for host libraries.
|
|
||||||
# Ideally we would like automagic-or-disabled here.
|
|
||||||
# But the check does not quite work on i686: bug #760926.
|
|
||||||
$(use_enable cet)
|
|
||||||
|
|
||||||
# We can enable this by default in future, but it's brand new
|
|
||||||
# in 2.39 with several bugs:
|
|
||||||
# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
|
|
||||||
# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
|
|
||||||
# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
|
|
||||||
# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
|
|
||||||
$(use_enable gprofng)
|
|
||||||
|
|
||||||
# Enables colored disassembly by default (equivalent to passing
|
|
||||||
# --disassembler-color=terminal to all objdump invocations).
|
|
||||||
--enable-colored-disassembly
|
|
||||||
)
|
|
||||||
|
|
||||||
case ${CTARGET} in
|
|
||||||
x86_64-*|aarch64*|arm64*|i[3456]*)
|
|
||||||
# These hardening options are available from 2.39+ but
|
|
||||||
# they unconditionally enable the behaviour even on arches
|
|
||||||
# where e.g. execstacks can't be avoided.
|
|
||||||
# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
|
|
||||||
#
|
|
||||||
# TODO: Get the logic for this fixed upstream so it doesn't
|
|
||||||
# create impossible broken combinations on some arches, like mips.
|
|
||||||
#
|
|
||||||
# TODO: Get the logic for this fixed upstream so --disable-* works
|
|
||||||
# as expected.
|
|
||||||
myconf+=(
|
|
||||||
--enable-warn-execstack=yes
|
|
||||||
--enable-warn-rwx-segments=yes
|
|
||||||
)
|
|
||||||
|
|
||||||
if use hardened ; then
|
|
||||||
myconf+=(
|
|
||||||
# TODO: breaks glibc test suite
|
|
||||||
#--enable-error-execstack=yes
|
|
||||||
#--enable-error-rwx-segments=yes
|
|
||||||
--enable-default-execstack=no
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if use elibc_musl ; then
|
|
||||||
# Override our earlier setting for musl, as textrels don't
|
|
||||||
# work there at all. See bug #707660.
|
|
||||||
myconf+=(
|
|
||||||
--enable-textrel-check=error
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use test || { use pgo && tc-is-lto ; } ; then
|
|
||||||
# -Wa,* needs to be consistent everywhere or lto-wrapper will complain
|
|
||||||
filter-flags '-Wa,*'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! is_cross ; then
|
|
||||||
myconf+=( $(use_enable pgo pgo-build $(tc-is-lto && echo "lto" || echo "yes")) )
|
|
||||||
|
|
||||||
if use pgo ; then
|
|
||||||
# We let configure handle it for us because it has to run
|
|
||||||
# the testsuite later on for profiling, and LTO isn't compatible
|
|
||||||
# with the testsuite.
|
|
||||||
filter-lto
|
|
||||||
|
|
||||||
export BUILD_CFLAGS="${CFLAGS}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
ECONF_SOURCE="${S}" econf "${myconf[@]}"
|
|
||||||
|
|
||||||
# Prevent makeinfo from running if doc is unset.
|
|
||||||
if ! use doc ; then
|
|
||||||
sed -i \
|
|
||||||
-e '/^MAKEINFO/s:=.*:= true:' \
|
|
||||||
Makefile || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
cd "${MY_BUILDDIR}" || die
|
|
||||||
|
|
||||||
# see Note [tooldir hack for ldscripts]
|
|
||||||
# see linker prefix patch
|
|
||||||
emake \
|
|
||||||
tooldir="${EPREFIX}${TOOLPATH}" \
|
|
||||||
gentoo_prefix=$(usex prefix-guest "${EPREFIX}"/usr /usr) \
|
|
||||||
all
|
|
||||||
|
|
||||||
# only build info pages if the user wants them
|
|
||||||
if use doc ; then
|
|
||||||
emake info
|
|
||||||
fi
|
|
||||||
|
|
||||||
# we nuke the manpages when we're left with junk
|
|
||||||
# (like when we bootstrap, no perl -> no manpages)
|
|
||||||
find . -name '*.1' -a -size 0 -delete
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
cd "${MY_BUILDDIR}" || die
|
|
||||||
|
|
||||||
(
|
|
||||||
# Tests don't expect LTO
|
|
||||||
filter-lto
|
|
||||||
|
|
||||||
# lto-wrapper warnings which confuse tests
|
|
||||||
filter-flags '-Wa,*'
|
|
||||||
|
|
||||||
# bug #637066
|
|
||||||
filter-flags -Wall -Wreturn-type
|
|
||||||
|
|
||||||
emake -k check \
|
|
||||||
CFLAGS_FOR_TARGET="${CFLAGS_FOR_TARGET:-${CFLAGS}}" \
|
|
||||||
CXXFLAGS_FOR_TARGET="${CXXFLAGS_FOR_TARGET:-${CXXFLAGS}}" \
|
|
||||||
LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}" \
|
|
||||||
CFLAGS="${CFLAGS}" \
|
|
||||||
CXXFLAGS="${CXXFLAGS}" \
|
|
||||||
LDFLAGS="${LDFLAGS}"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local x d
|
|
||||||
|
|
||||||
cd "${MY_BUILDDIR}" || die
|
|
||||||
|
|
||||||
# see Note [tooldir hack for ldscripts]
|
|
||||||
emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
|
|
||||||
rm -rf "${ED}"/${LIBPATH}/bin || die
|
|
||||||
use static-libs || find "${ED}" -name '*.la' -delete
|
|
||||||
|
|
||||||
# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
|
|
||||||
cd "${ED}"/${LIBPATH} || die
|
|
||||||
for d in ../* ; do
|
|
||||||
[[ ${d} == ../${PV} ]] && continue
|
|
||||||
mv ${d}/* . || die
|
|
||||||
rmdir ${d} || die
|
|
||||||
done
|
|
||||||
|
|
||||||
# Now we collect everything intp the proper SLOT-ed dirs
|
|
||||||
# When something is built to cross-compile, it installs into
|
|
||||||
# /usr/$CHOST/ by default ... we have to 'fix' that :)
|
|
||||||
if is_cross ; then
|
|
||||||
cd "${ED}"/${BINPATH} || die
|
|
||||||
for x in * ; do
|
|
||||||
mv ${x} ${x/${CTARGET}-} || die
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
|
|
||||||
mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
|
|
||||||
mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
|
|
||||||
rm -r "${ED}"/usr/${CHOST}/{include,lib}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
insinto ${INCPATH}
|
|
||||||
local libiberty_headers=(
|
|
||||||
# Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir.
|
|
||||||
demangle.h
|
|
||||||
dyn-string.h
|
|
||||||
fibheap.h
|
|
||||||
hashtab.h
|
|
||||||
libiberty.h
|
|
||||||
objalloc.h
|
|
||||||
splay-tree.h
|
|
||||||
)
|
|
||||||
doins "${libiberty_headers[@]/#/${S}/include/}"
|
|
||||||
if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
|
|
||||||
mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ || die
|
|
||||||
rm -r "${ED}"/${LIBPATH}/lib || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate an env.d entry for this binutils
|
|
||||||
insinto /etc/env.d/binutils
|
|
||||||
cat <<-EOF > "${T}"/env.d
|
|
||||||
TARGET="${CTARGET}"
|
|
||||||
VER="${PV}"
|
|
||||||
LIBPATH="${EPREFIX}${LIBPATH}"
|
|
||||||
EOF
|
|
||||||
newins "${T}"/env.d ${CTARGET}-${PV}
|
|
||||||
|
|
||||||
# Handle documentation
|
|
||||||
if ! is_cross ; then
|
|
||||||
cd "${S}" || die
|
|
||||||
dodoc README
|
|
||||||
|
|
||||||
docinto bfd
|
|
||||||
dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
|
|
||||||
|
|
||||||
docinto binutils
|
|
||||||
dodoc binutils/ChangeLog binutils/NEWS binutils/README
|
|
||||||
|
|
||||||
docinto gas
|
|
||||||
dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
|
|
||||||
|
|
||||||
docinto gprof
|
|
||||||
dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
|
|
||||||
|
|
||||||
docinto ld
|
|
||||||
dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
|
|
||||||
|
|
||||||
docinto libiberty
|
|
||||||
dodoc libiberty/ChangeLog* libiberty/README
|
|
||||||
|
|
||||||
docinto opcodes
|
|
||||||
dodoc opcodes/ChangeLog*
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove shared info pages
|
|
||||||
rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
|
|
||||||
|
|
||||||
docompress "${DATAPATH}"/{info,man}
|
|
||||||
|
|
||||||
# Trim all empty dirs
|
|
||||||
find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
# Make sure this ${CTARGET} has a binutils version selected
|
|
||||||
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
|
|
||||||
binutils-config ${CTARGET}-${PV} || eerror binutils-config returned an error
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
local current_profile=$(binutils-config -c ${CTARGET})
|
|
||||||
|
|
||||||
# If no other versions exist, then uninstall for this
|
|
||||||
# target ... otherwise, switch to the newest version
|
|
||||||
# Note: only do this if this version is unmerged. We
|
|
||||||
# rerun binutils-config if this is a remerge, as
|
|
||||||
# we want the mtimes on the symlinks updated (if
|
|
||||||
# it is the same as the current selected profile)
|
|
||||||
if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
|
|
||||||
local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
|
|
||||||
choice=${choice//$'\n'/ }
|
|
||||||
choice=${choice/* }
|
|
||||||
if [[ -z ${choice} ]] ; then
|
|
||||||
binutils-config -u ${CTARGET} || eerror binutils-config returned an error
|
|
||||||
else
|
|
||||||
binutils-config ${choice} || eerror binutils-config returned an error
|
|
||||||
fi
|
|
||||||
elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
|
|
||||||
binutils-config ${CTARGET}-${PV} || eerror binutils-config returned an error
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Note [slotting support]
|
|
||||||
# -----------------------
|
|
||||||
# Gentoo's layout for binutils files is non-standard as Gentoo
|
|
||||||
# supports slotted installation for binutils. Many tools
|
|
||||||
# still expect binutils to reside in known locations.
|
|
||||||
# binutils-config package restores symlinks into known locations,
|
|
||||||
# like:
|
|
||||||
# /usr/bin/${CTARGET}-<tool>
|
|
||||||
# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
|
|
||||||
# /usr/include/
|
|
||||||
#
|
|
||||||
# Note [tooldir hack for ldscripts]
|
|
||||||
# ---------------------------------
|
|
||||||
# Build system does not allow ./configure to tweak every location
|
|
||||||
# we need for slotting binutils hence all the shuffling in
|
|
||||||
# src_install(). This note is about SCRIPTDIR define handling.
|
|
||||||
#
|
|
||||||
# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
|
|
||||||
# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
|
|
||||||
# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
|
|
||||||
# Thus we can't just move files around after compilation finished.
|
|
||||||
#
|
|
||||||
# Our goal is the following:
|
|
||||||
# - at build-time set scriptdir to point to symlinked location:
|
|
||||||
# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
|
|
||||||
# - at install-time set scriptdir to point to slotted location:
|
|
||||||
# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
|
|
||||||
@ -134,13 +134,16 @@ src_prepare() {
|
|||||||
|
|
||||||
if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then
|
if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then
|
||||||
if ! use vanilla; then
|
if ! use vanilla; then
|
||||||
|
# We backported a patch in 2.44 but it needed a few
|
||||||
|
# followups. Better to just handle it in 2.45 instead.
|
||||||
|
rm "${WORKDIR}/patch/0007-strip-Add-GCC-LTO-IR-support.patch" \
|
||||||
|
"${WORKDIR}/patch/0008-ld-testsuite-Use-plug_opt-for-plugin-option.patch" \
|
||||||
|
"${WORKDIR}/patch/0009-binutils-Don-t-complain-plugin-with-all-LTO-sections.patch" || die
|
||||||
|
|
||||||
einfo "Applying binutils patchset ${patchsetname}"
|
einfo "Applying binutils patchset ${patchsetname}"
|
||||||
eapply "${WORKDIR}/patch"
|
eapply "${WORKDIR}/patch"
|
||||||
einfo "Done."
|
einfo "Done."
|
||||||
|
|
||||||
# This is a fix on top of a patch we backported to 2.44
|
|
||||||
eapply "${FILESDIR}"/${P}-strip-static.patch
|
|
||||||
|
|
||||||
# This is applied conditionally for now just out of caution.
|
# This is applied conditionally for now just out of caution.
|
||||||
# It should be okay on non-prefix systems though. See bug #892549.
|
# It should be okay on non-prefix systems though. See bug #892549.
|
||||||
if is_cross || use prefix; then
|
if is_cross || use prefix; then
|
||||||
@ -19,7 +19,7 @@ IUSE="cet debuginfod doc gprofng hardened multitarget +nls pgo +plugins static-l
|
|||||||
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
|
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
|
||||||
# for the patchsets
|
# for the patchsets
|
||||||
|
|
||||||
PATCH_VER=1
|
PATCH_VER=4
|
||||||
PATCH_DEV=dilfridge
|
PATCH_DEV=dilfridge
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]]; then
|
if [[ ${PV} == 9999 ]]; then
|
||||||
@ -134,6 +134,12 @@ src_prepare() {
|
|||||||
|
|
||||||
if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then
|
if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then
|
||||||
if ! use vanilla; then
|
if ! use vanilla; then
|
||||||
|
# We backported a patch in 2.44 but it needed a few
|
||||||
|
# followups. Better to just handle it in 2.45 instead.
|
||||||
|
rm "${WORKDIR}/patch/0007-strip-Add-GCC-LTO-IR-support.patch" \
|
||||||
|
"${WORKDIR}/patch/0008-ld-testsuite-Use-plug_opt-for-plugin-option.patch" \
|
||||||
|
"${WORKDIR}/patch/0009-binutils-Don-t-complain-plugin-with-all-LTO-sections.patch" || die
|
||||||
|
|
||||||
einfo "Applying binutils patchset ${patchsetname}"
|
einfo "Applying binutils patchset ${patchsetname}"
|
||||||
eapply "${WORKDIR}/patch"
|
eapply "${WORKDIR}/patch"
|
||||||
einfo "Done."
|
einfo "Done."
|
||||||
|
|||||||
@ -35,7 +35,7 @@ else
|
|||||||
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
||||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
||||||
SLOT=$(ver_cut 1-2)
|
SLOT=$(ver_cut 1-2)
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -142,7 +142,7 @@ src_prepare() {
|
|||||||
# It should be okay on non-prefix systems though. See bug #892549.
|
# It should be okay on non-prefix systems though. See bug #892549.
|
||||||
if is_cross || use prefix; then
|
if is_cross || use prefix; then
|
||||||
eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
|
eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
|
||||||
"${FILESDIR}"/binutils-2.41-linker-prefix.patch
|
"${FILESDIR}"/binutils-2.43-linker-prefix.patch
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -295,9 +295,9 @@ src_configure() {
|
|||||||
|
|
||||||
# We can enable this by default in future, but it's brand new
|
# We can enable this by default in future, but it's brand new
|
||||||
# in 2.39 with several bugs:
|
# in 2.39 with several bugs:
|
||||||
# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
|
# - Doesn't build on musl (https://sourceware.org/PR29477)
|
||||||
# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
|
# - No man pages (https://sourceware.org/PR29521)
|
||||||
# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
|
# - Broken at runtime without Java (https://sourceware.org/PR29479)
|
||||||
# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
|
# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
|
||||||
$(use_enable gprofng)
|
$(use_enable gprofng)
|
||||||
|
|
||||||
@ -311,7 +311,7 @@ src_configure() {
|
|||||||
# These hardening options are available from 2.39+ but
|
# These hardening options are available from 2.39+ but
|
||||||
# they unconditionally enable the behaviour even on arches
|
# they unconditionally enable the behaviour even on arches
|
||||||
# where e.g. execstacks can't be avoided.
|
# where e.g. execstacks can't be avoided.
|
||||||
# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
|
# See https://sourceware.org/PR29592.
|
||||||
#
|
#
|
||||||
# TODO: Get the logic for this fixed upstream so it doesn't
|
# TODO: Get the logic for this fixed upstream so it doesn't
|
||||||
# create impossible broken combinations on some arches, like mips.
|
# create impossible broken combinations on some arches, like mips.
|
||||||
@ -526,6 +526,57 @@ src_install() {
|
|||||||
find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
|
find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Simple test to make sure our new binutils isn't completely broken.
|
||||||
|
# Skip if this binutils is a cross compiler.
|
||||||
|
#
|
||||||
|
# If coreutils is built with USE=multicall, some of these files
|
||||||
|
# will just be wrapper scripts, not actual ELFs we can test.
|
||||||
|
binutils_sanity_check() {
|
||||||
|
pushd "${T}" >/dev/null
|
||||||
|
|
||||||
|
einfo "Last-minute run tests with binutils in ${ED}${BINPATH} ..."
|
||||||
|
|
||||||
|
cat <<-EOF > "${T}"/number.c
|
||||||
|
int get_magic_number() {
|
||||||
|
return 42;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat <<-EOF > "${T}"/test.c
|
||||||
|
#include <stdio.h>
|
||||||
|
int get_magic_number();
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
printf("Hello Gentoo! Your magic number is: %d\n", get_magic_number());
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
local -x LD_LIBRARY_PATH="${ED}${LIBPATH}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
|
||||||
|
|
||||||
|
local opt opt2
|
||||||
|
# TODO: test multilib variants?
|
||||||
|
for opt in '' '-O2' ; do
|
||||||
|
for opt2 in '-static' '-static-pie' '-fno-PIE -no-pie' ; do
|
||||||
|
$(tc-getCC) ${opt} ${opt2} -B"${ED}${BINPATH}" "${T}"/number.c "${T}"/test.c -o "${T}"/test
|
||||||
|
if "${T}"/test | grep -q "Hello Gentoo! Your magic number is: 42" ; then
|
||||||
|
:;
|
||||||
|
else
|
||||||
|
die "Test with '${opt} ${opt2}' failed! Aborting to avoid broken binutils!"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
popd >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
[[ -n ${ROOT} ]] && return 0
|
||||||
|
[[ -d ${ED}${BINPATH} ]] || return 0
|
||||||
|
[[ -n ${BOOTSTRAP_RAP} ]] || return 0
|
||||||
|
is_cross && return 0
|
||||||
|
binutils_sanity_check
|
||||||
|
}
|
||||||
|
|
||||||
pkg_postinst() {
|
pkg_postinst() {
|
||||||
# Make sure this ${CTARGET} has a binutils version selected
|
# Make sure this ${CTARGET} has a binutils version selected
|
||||||
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
|
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
|
||||||
@ -19,7 +19,7 @@ IUSE="cet debuginfod doc gprofng hardened multitarget +nls pgo +plugins static-l
|
|||||||
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
|
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
|
||||||
# for the patchsets
|
# for the patchsets
|
||||||
|
|
||||||
PATCH_VER=4
|
PATCH_VER=1
|
||||||
PATCH_DEV=dilfridge
|
PATCH_DEV=dilfridge
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]]; then
|
if [[ ${PV} == 9999 ]]; then
|
||||||
@ -142,7 +142,7 @@ src_prepare() {
|
|||||||
# It should be okay on non-prefix systems though. See bug #892549.
|
# It should be okay on non-prefix systems though. See bug #892549.
|
||||||
if is_cross || use prefix; then
|
if is_cross || use prefix; then
|
||||||
eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
|
eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
|
||||||
"${FILESDIR}"/binutils-2.41-linker-prefix.patch
|
"${FILESDIR}"/binutils-2.43-linker-prefix.patch
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -295,9 +295,9 @@ src_configure() {
|
|||||||
|
|
||||||
# We can enable this by default in future, but it's brand new
|
# We can enable this by default in future, but it's brand new
|
||||||
# in 2.39 with several bugs:
|
# in 2.39 with several bugs:
|
||||||
# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
|
# - Doesn't build on musl (https://sourceware.org/PR29477)
|
||||||
# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
|
# - No man pages (https://sourceware.org/PR29521)
|
||||||
# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
|
# - Broken at runtime without Java (https://sourceware.org/PR29479)
|
||||||
# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
|
# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
|
||||||
$(use_enable gprofng)
|
$(use_enable gprofng)
|
||||||
|
|
||||||
@ -311,7 +311,7 @@ src_configure() {
|
|||||||
# These hardening options are available from 2.39+ but
|
# These hardening options are available from 2.39+ but
|
||||||
# they unconditionally enable the behaviour even on arches
|
# they unconditionally enable the behaviour even on arches
|
||||||
# where e.g. execstacks can't be avoided.
|
# where e.g. execstacks can't be avoided.
|
||||||
# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
|
# See https://sourceware.org/PR29592.
|
||||||
#
|
#
|
||||||
# TODO: Get the logic for this fixed upstream so it doesn't
|
# TODO: Get the logic for this fixed upstream so it doesn't
|
||||||
# create impossible broken combinations on some arches, like mips.
|
# create impossible broken combinations on some arches, like mips.
|
||||||
@ -526,6 +526,57 @@ src_install() {
|
|||||||
find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
|
find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Simple test to make sure our new binutils isn't completely broken.
|
||||||
|
# Skip if this binutils is a cross compiler.
|
||||||
|
#
|
||||||
|
# If coreutils is built with USE=multicall, some of these files
|
||||||
|
# will just be wrapper scripts, not actual ELFs we can test.
|
||||||
|
binutils_sanity_check() {
|
||||||
|
pushd "${T}" >/dev/null
|
||||||
|
|
||||||
|
einfo "Last-minute run tests with binutils in ${ED}${BINPATH} ..."
|
||||||
|
|
||||||
|
cat <<-EOF > "${T}"/number.c
|
||||||
|
int get_magic_number() {
|
||||||
|
return 42;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat <<-EOF > "${T}"/test.c
|
||||||
|
#include <stdio.h>
|
||||||
|
int get_magic_number();
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
printf("Hello Gentoo! Your magic number is: %d\n", get_magic_number());
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
local -x LD_LIBRARY_PATH="${ED}${LIBPATH}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
|
||||||
|
|
||||||
|
local opt opt2
|
||||||
|
# TODO: test multilib variants?
|
||||||
|
for opt in '' '-O2' ; do
|
||||||
|
for opt2 in '-static' '-static-pie' '-fno-PIE -no-pie' ; do
|
||||||
|
$(tc-getCC) ${opt} ${opt2} -B"${ED}${BINPATH}" "${T}"/number.c "${T}"/test.c -o "${T}"/test
|
||||||
|
if "${T}"/test | grep -q "Hello Gentoo! Your magic number is: 42" ; then
|
||||||
|
:;
|
||||||
|
else
|
||||||
|
die "Test with '${opt} ${opt2}' failed! Aborting to avoid broken binutils!"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
popd >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
[[ -n ${ROOT} ]] && return 0
|
||||||
|
[[ -d ${ED}${BINPATH} ]] || return 0
|
||||||
|
[[ -n ${BOOTSTRAP_RAP} ]] || return 0
|
||||||
|
is_cross && return 0
|
||||||
|
binutils_sanity_check
|
||||||
|
}
|
||||||
|
|
||||||
pkg_postinst() {
|
pkg_postinst() {
|
||||||
# Make sure this ${CTARGET} has a binutils version selected
|
# Make sure this ${CTARGET} has a binutils version selected
|
||||||
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
|
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
|
||||||
@ -141,7 +141,7 @@ src_prepare() {
|
|||||||
# This is applied conditionally for now just out of caution.
|
# This is applied conditionally for now just out of caution.
|
||||||
# It should be okay on non-prefix systems though. See bug #892549.
|
# It should be okay on non-prefix systems though. See bug #892549.
|
||||||
if is_cross || use prefix; then
|
if is_cross || use prefix; then
|
||||||
eapply "${FILESDIR}"/binutils-2.43-linker-search-path.patch \
|
eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
|
||||||
"${FILESDIR}"/binutils-2.43-linker-prefix.patch
|
"${FILESDIR}"/binutils-2.43-linker-prefix.patch
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,155 +0,0 @@
|
|||||||
https://bugs.gentoo.org/957882
|
|
||||||
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=eee822a66066a17529d7af544b1be767517a6c72
|
|
||||||
|
|
||||||
From eee822a66066a17529d7af544b1be767517a6c72 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "H.J. Lu" <hjl.tools@gmail.com>
|
|
||||||
Date: Fri, 13 Jun 2025 08:20:49 +0800
|
|
||||||
Subject: [PATCH] objcopy: Correctly check archive element for LTO IR
|
|
||||||
|
|
||||||
commit 717a38e9a02109fcbcb18bb2ec3aa251e2ad0a0d
|
|
||||||
Author: H.J. Lu <hjl.tools@gmail.com>
|
|
||||||
Date: Sun May 4 05:12:46 2025 +0800
|
|
||||||
|
|
||||||
strip: Add GCC LTO IR support
|
|
||||||
|
|
||||||
added:
|
|
||||||
|
|
||||||
@@ -3744,6 +3768,12 @@ copy_archive (bfd *ibfd, bfd *obfd, const char
|
|
||||||
*output_target,
|
|
||||||
goto cleanup_and_exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if BFD_SUPPORTS_PLUGINS
|
|
||||||
+ /* Copy LTO IR file as unknown object. */
|
|
||||||
+ if (bfd_plugin_target_p (ibfd->xvec))
|
|
||||||
^^^^ A typo, should be this_element.
|
|
||||||
+ ok_object = false;
|
|
||||||
+ else
|
|
||||||
+#endif
|
|
||||||
if (ok_object)
|
|
||||||
{
|
|
||||||
ok = copy_object (this_element, output_element, input_arch);
|
|
||||||
|
|
||||||
to check if the archive element is a LTO IR file. "ibfd" is the archive
|
|
||||||
BFD. "this_element" should be used to check for LTO IR in the archive
|
|
||||||
element. Fix it by replacing "ibfd" with "this_element".
|
|
||||||
|
|
||||||
PR binutils/33078
|
|
||||||
* objcopy.c (copy_archive): Correctly check archive element for
|
|
||||||
LTO IR.
|
|
||||||
* testsuite/binutils-all/objcopy.exp (strip_test_archive): New.
|
|
||||||
Run strip_test_archive.
|
|
||||||
|
|
||||||
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
|
|
||||||
---
|
|
||||||
binutils/objcopy.c | 2 +-
|
|
||||||
binutils/testsuite/binutils-all/objcopy.exp | 81 +++++++++++++++++++++
|
|
||||||
2 files changed, 82 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
|
|
||||||
index a973789b1d5..366e1079d82 100644
|
|
||||||
--- a/binutils/objcopy.c
|
|
||||||
+++ b/binutils/objcopy.c
|
|
||||||
@@ -3770,7 +3770,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
|
|
||||||
|
|
||||||
#if BFD_SUPPORTS_PLUGINS
|
|
||||||
/* Copy LTO IR file as unknown object. */
|
|
||||||
- if (bfd_plugin_target_p (ibfd->xvec))
|
|
||||||
+ if (bfd_plugin_target_p (this_element->xvec))
|
|
||||||
ok_object = false;
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
|
|
||||||
index cf94570642c..6aa6d2d9fe7 100644
|
|
||||||
--- a/binutils/testsuite/binutils-all/objcopy.exp
|
|
||||||
+++ b/binutils/testsuite/binutils-all/objcopy.exp
|
|
||||||
@@ -661,6 +661,87 @@ proc strip_test_with_saving_a_symbol { } {
|
|
||||||
|
|
||||||
strip_test_with_saving_a_symbol
|
|
||||||
|
|
||||||
+# Test stripping an archive.
|
|
||||||
+
|
|
||||||
+proc strip_test_archive { } {
|
|
||||||
+ global AR
|
|
||||||
+ global CC
|
|
||||||
+ global STRIP
|
|
||||||
+ global srcdir
|
|
||||||
+ global subdir
|
|
||||||
+
|
|
||||||
+ set test "strip -g on archive"
|
|
||||||
+
|
|
||||||
+ if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog.o object debug] != "" } {
|
|
||||||
+ untested $test
|
|
||||||
+ return
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ set stripobjfile tmpdir/striptestprog.o
|
|
||||||
+ set stripobjarchive testprog.o
|
|
||||||
+ if [is_remote host] {
|
|
||||||
+ set archive libstrip.a
|
|
||||||
+ set objfile [remote_download host tmpdir/testprog.o]
|
|
||||||
+ remote_file host delete $archive
|
|
||||||
+ remote_file host delete $stripobjfile
|
|
||||||
+ remote_file host delete $stripobjarchive
|
|
||||||
+ } else {
|
|
||||||
+ set archive tmpdir/libstrip.a
|
|
||||||
+ set objfile tmpdir/testprog.o
|
|
||||||
+ remote_file build delete $stripobjfile
|
|
||||||
+ remote_file build delete $stripobjarchive
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ remote_file build delete tmpdir/libstrip.a
|
|
||||||
+
|
|
||||||
+ set exec_output [binutils_run $STRIP "-g -o $stripobjfile $objfile"]
|
|
||||||
+ set exec_output [prune_warnings $exec_output]
|
|
||||||
+ if ![string equal "" $exec_output] {
|
|
||||||
+ fail $test
|
|
||||||
+ return
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ set exec_output [binutils_run $AR "rc $archive ${objfile}"]
|
|
||||||
+ set exec_output [prune_warnings $exec_output]
|
|
||||||
+ if ![string equal "" $exec_output] {
|
|
||||||
+ fail $test
|
|
||||||
+ return
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ set exec_output [binutils_run $STRIP "-g $archive"]
|
|
||||||
+ set exec_output [prune_warnings $exec_output]
|
|
||||||
+ if ![string equal "" $exec_output] {
|
|
||||||
+ fail $test
|
|
||||||
+ return
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ set exec_output [binutils_run $AR "x $archive"]
|
|
||||||
+ set exec_output [prune_warnings $exec_output]
|
|
||||||
+ if ![string equal "" $exec_output] {
|
|
||||||
+ fail $test
|
|
||||||
+ return
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if [is_remote host] {
|
|
||||||
+ set stripobjfile [remote_download host $stripobjfile]
|
|
||||||
+ set stripobjarchive [remote_download host $stripobjarchive]
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ send_log "cmp $stripobjarchive $stripobjfile\n"
|
|
||||||
+ verbose "cmp $stripobjarchive $stripobjfile"
|
|
||||||
+ set status [remote_exec build cmp "$stripobjarchive $stripobjfile"]
|
|
||||||
+ set exec_output [lindex $status 1]
|
|
||||||
+ set exec_output [prune_warnings $exec_output]
|
|
||||||
+
|
|
||||||
+ if [string equal "" $exec_output] then {
|
|
||||||
+ pass $test
|
|
||||||
+ } else {
|
|
||||||
+ fail $test
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+strip_test_archive
|
|
||||||
+
|
|
||||||
# Build a final executable.
|
|
||||||
|
|
||||||
set exe [exeext]
|
|
||||||
--
|
|
||||||
2.43.5
|
|
||||||
Loading…
x
Reference in New Issue
Block a user