diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD index 6dfdf2ee5..04fbcd75e 100644 --- a/cross/binutils-aarch64/APKBUILD +++ b/cross/binutils-aarch64/APKBUILD @@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-aarch64 pkgver=2.40 -pkgrel=4 +pkgrel=5 pkgdesc="Tools necessary to build programs for aarch64 targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" @@ -55,19 +55,6 @@ build() { local _gold_configure="--disable-gold" local _plugin_configure="--enable-plugins" - case "$CARCH" in - riscv64) - # binutils creates empty textrels here - # https://sourceware.org/bugzilla/show_bug.cgi?id=25694 - local no_textrels="" - ;; - *) - # set -z text by default - # this is the default for linkers such as ld.lld too - local no_textrels="--enable-textrel-check=error" - ;; - esac - if [ "$CHOST" != "$CTARGET" ]; then _sysroot="$CBUILDROOT" _cross_configure="--disable-install-libiberty" @@ -107,7 +94,6 @@ build() { $_cross_configure \ $_arch_configure \ --enable-default-hash-style=gnu \ - $no_textrels \ --with-pic \ --disable-werror \ --disable-nls \ diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD index 8bd9a087c..2e74ad273 100644 --- a/cross/binutils-armhf/APKBUILD +++ b/cross/binutils-armhf/APKBUILD @@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-armhf pkgver=2.40 -pkgrel=4 +pkgrel=5 pkgdesc="Tools necessary to build programs for armhf targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" @@ -55,19 +55,6 @@ build() { local _gold_configure="--disable-gold" local _plugin_configure="--enable-plugins" - case "$CARCH" in - riscv64) - # binutils creates empty textrels here - # https://sourceware.org/bugzilla/show_bug.cgi?id=25694 - local no_textrels="" - ;; - *) - # set -z text by default - # this is the default for linkers such as ld.lld too - local no_textrels="--enable-textrel-check=error" - ;; - esac - if [ "$CHOST" != "$CTARGET" ]; then _sysroot="$CBUILDROOT" _cross_configure="--disable-install-libiberty" @@ -107,7 +94,6 @@ build() { $_cross_configure \ $_arch_configure \ --enable-default-hash-style=gnu \ - $no_textrels \ --with-pic \ --disable-werror \ --disable-nls \ diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD index e019b584c..ca679b67b 100644 --- a/cross/binutils-armv7/APKBUILD +++ b/cross/binutils-armv7/APKBUILD @@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-armv7 pkgver=2.40 -pkgrel=4 +pkgrel=5 pkgdesc="Tools necessary to build programs for armv7 targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" @@ -55,19 +55,6 @@ build() { local _gold_configure="--disable-gold" local _plugin_configure="--enable-plugins" - case "$CARCH" in - riscv64) - # binutils creates empty textrels here - # https://sourceware.org/bugzilla/show_bug.cgi?id=25694 - local no_textrels="" - ;; - *) - # set -z text by default - # this is the default for linkers such as ld.lld too - local no_textrels="--enable-textrel-check=error" - ;; - esac - if [ "$CHOST" != "$CTARGET" ]; then _sysroot="$CBUILDROOT" _cross_configure="--disable-install-libiberty" @@ -107,7 +94,6 @@ build() { $_cross_configure \ $_arch_configure \ --enable-default-hash-style=gnu \ - $no_textrels \ --with-pic \ --disable-werror \ --disable-nls \ diff --git a/cross/binutils-riscv64/APKBUILD b/cross/binutils-riscv64/APKBUILD index bd2d393f0..cc5fcaae9 100644 --- a/cross/binutils-riscv64/APKBUILD +++ b/cross/binutils-riscv64/APKBUILD @@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-riscv64 pkgver=2.40 -pkgrel=4 +pkgrel=5 pkgdesc="Tools necessary to build programs for riscv64 targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" @@ -55,19 +55,6 @@ build() { local _gold_configure="--disable-gold" local _plugin_configure="--enable-plugins" - case "$CARCH" in - riscv64) - # binutils creates empty textrels here - # https://sourceware.org/bugzilla/show_bug.cgi?id=25694 - local no_textrels="" - ;; - *) - # set -z text by default - # this is the default for linkers such as ld.lld too - local no_textrels="--enable-textrel-check=error" - ;; - esac - if [ "$CHOST" != "$CTARGET" ]; then _sysroot="$CBUILDROOT" _cross_configure="--disable-install-libiberty" @@ -107,7 +94,6 @@ build() { $_cross_configure \ $_arch_configure \ --enable-default-hash-style=gnu \ - $no_textrels \ --with-pic \ --disable-werror \ --disable-nls \