|
@@ -68,7 +68,7 @@ Summary: A GNU collection of binary utilities.
|
|
Summary(ja): GNU 版バイナリユーティリティ集
|
|
Summary(ja): GNU 版バイナリユーティリティ集
|
|
Name: binutils
|
|
Name: binutils
|
|
Version: 2.42
|
|
Version: 2.42
|
|
-Release: 1%{?_dist_release}
|
|
|
|
|
|
+Release: 2%{?_dist_release}
|
|
Group: programming
|
|
Group: programming
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
@@ -84,7 +84,7 @@ Source2: binutils-2.19.50.0.1-output-format.sed
|
|
|
|
|
|
#----------------------------------------------------------------------------
|
|
#----------------------------------------------------------------------------
|
|
|
|
|
|
-Patch00: binutils-%{version}-20240605.patch
|
|
|
|
|
|
+Patch00: binutils-%{version}-20240708.patch
|
|
|
|
|
|
# Purpose: Use /lib64 and /usr/lib64 instead of /lib and /usr/lib in the
|
|
# Purpose: Use /lib64 and /usr/lib64 instead of /lib and /usr/lib in the
|
|
# default library search path of 64-bit targets.
|
|
# default library search path of 64-bit targets.
|
|
@@ -352,10 +352,6 @@ CARGS=
|
|
CARGS="$CARGS --with-debuginfod"
|
|
CARGS="$CARGS --with-debuginfod"
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
|
|
|
|
-CARGS="$CARGS --enable-64-bit-bfd"
|
|
|
|
-%endif
|
|
|
|
-
|
|
|
|
# Extra targets to build along with the default one.
|
|
# Extra targets to build along with the default one.
|
|
#
|
|
#
|
|
# BZ 1920373: Enable PEP support for all targets as the PERF package's
|
|
# BZ 1920373: Enable PEP support for all targets as the PERF package's
|
|
@@ -378,6 +374,7 @@ CARGS="$CARGS --enable-warn-rwx-segments=yes"
|
|
# We could optimize the cross builds size by --enable-shared but the produced
|
|
# We could optimize the cross builds size by --enable-shared but the produced
|
|
# binaries may be less convenient in the embedded environment.
|
|
# binaries may be less convenient in the embedded environment.
|
|
%configure \
|
|
%configure \
|
|
|
|
+ --quiet \
|
|
--build=%{_target_platform} --host=%{_target_platform} \
|
|
--build=%{_target_platform} --host=%{_target_platform} \
|
|
--target=%{binutils_target} \
|
|
--target=%{binutils_target} \
|
|
%ifarch %gold_arches
|
|
%ifarch %gold_arches
|
|
@@ -390,6 +387,7 @@ CARGS="$CARGS --enable-warn-rwx-segments=yes"
|
|
--with-sysroot=/ \
|
|
--with-sysroot=/ \
|
|
%else
|
|
%else
|
|
--enable-targets=%{_host} \
|
|
--enable-targets=%{_host} \
|
|
|
|
+ --enable-64-bit-bfd \
|
|
--with-sysroot=%{_prefix}/%{binutils_target}/sys-root \
|
|
--with-sysroot=%{_prefix}/%{binutils_target}/sys-root \
|
|
--program-prefix=%{cross} \
|
|
--program-prefix=%{cross} \
|
|
%endif
|
|
%endif
|
|
@@ -452,18 +450,23 @@ make %{_smp_mflags} tooldir=%{_prefix} info
|
|
%if %{without testsuite}
|
|
%if %{without testsuite}
|
|
echo ====================TESTSUITE DISABLED=========================
|
|
echo ====================TESTSUITE DISABLED=========================
|
|
%else
|
|
%else
|
|
-# The GOLD testsuite has lots of problems...
|
|
|
|
-make -k check < /dev/null || :
|
|
|
|
|
|
+rm -f check_error
|
|
|
|
+make -k check-gas check-binutils check-ld < /dev/null || echo "failed" > check_error
|
|
|
|
+# The GOLD testsuite always returns an error code, even if no tests fail.
|
|
|
|
+make -k check-gold < /dev/null || :
|
|
echo ====================TESTING=========================
|
|
echo ====================TESTING=========================
|
|
-cat {gas/testsuite/gas,ld/ld,binutils/binutils}.sum
|
|
|
|
-%if %{with gold}
|
|
|
|
|
|
+for f in {gas/testsuite/gas,ld/ld,binutils/binutils}.sum
|
|
|
|
+do
|
|
|
|
+if [ -f $f ]; then
|
|
|
|
+ cat $f
|
|
|
|
+fi
|
|
|
|
+done
|
|
if [ -f gold/test-suite.log ]; then
|
|
if [ -f gold/test-suite.log ]; then
|
|
cat gold/test-suite.log
|
|
cat gold/test-suite.log
|
|
fi
|
|
fi
|
|
if [ -f gold/testsuite/test-suite.log ]; then
|
|
if [ -f gold/testsuite/test-suite.log ]; then
|
|
cat gold/testsuite/*.log
|
|
cat gold/testsuite/*.log
|
|
fi
|
|
fi
|
|
-%endif
|
|
|
|
echo ====================TESTING END=====================
|
|
echo ====================TESTING END=====================
|
|
for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log}
|
|
for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log}
|
|
do
|
|
do
|
|
@@ -472,14 +475,15 @@ done
|
|
tar cjf binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}-*.{sum,log}
|
|
tar cjf binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}-*.{sum,log}
|
|
uuencode binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}.tar.xz
|
|
uuencode binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}.tar.xz
|
|
rm -f binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}-*.{sum,log}
|
|
rm -f binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}-*.{sum,log}
|
|
-%if %{with gold}
|
|
|
|
if [ -f gold/testsuite/test-suite.log ]; then
|
|
if [ -f gold/testsuite/test-suite.log ]; then
|
|
tar cjf binutils-%{_target_platform}-gold.log.tar.xz gold/testsuite/*.log
|
|
tar cjf binutils-%{_target_platform}-gold.log.tar.xz gold/testsuite/*.log
|
|
uuencode binutils-%{_target_platform}-gold.log.tar.xz binutils-%{_target_platform}-gold.log.tar.xz
|
|
uuencode binutils-%{_target_platform}-gold.log.tar.xz binutils-%{_target_platform}-gold.log.tar.xz
|
|
rm -f binutils-%{_target_platform}-gold.log.tar.xz
|
|
rm -f binutils-%{_target_platform}-gold.log.tar.xz
|
|
fi
|
|
fi
|
|
%endif
|
|
%endif
|
|
-%endif
|
|
|
|
|
|
+if [ -f check_error ]; then
|
|
|
|
+ exit 1
|
|
|
|
+fi
|
|
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
@@ -549,10 +553,10 @@ rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
|
|
# Remove libtool files, which reference the .so libs
|
|
# Remove libtool files, which reference the .so libs
|
|
rm -f %{buildroot}%{_libdir}/*.la
|
|
rm -f %{buildroot}%{_libdir}/*.la
|
|
|
|
|
|
-# Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
|
|
|
|
-%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
|
|
|
|
# Sanity check --enable-64-bit-bfd really works.
|
|
# Sanity check --enable-64-bit-bfd really works.
|
|
grep '^#define BFD_ARCH_SIZE 64$' %{buildroot}%{_prefix}/include/bfd.h
|
|
grep '^#define BFD_ARCH_SIZE 64$' %{buildroot}%{_prefix}/include/bfd.h
|
|
|
|
+# Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
|
|
|
|
+%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
|
|
sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \
|
|
sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \
|
|
-e 's/^#define BFD_DEFAULT_TARGET_SIZE \(32\|64\) *$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \
|
|
-e 's/^#define BFD_DEFAULT_TARGET_SIZE \(32\|64\) *$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \
|
|
-e 's/^#define BFD_HOST_64BIT_LONG [01] *$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \
|
|
-e 's/^#define BFD_HOST_64BIT_LONG [01] *$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \
|
|
@@ -582,7 +586,7 @@ $OUTPUT_FORMAT
|
|
|
|
|
|
/* The libz dependency is unexpected by legacy build scripts. */
|
|
/* The libz dependency is unexpected by legacy build scripts. */
|
|
/* The libdl dependency is for plugin support. (BZ 889134) */
|
|
/* The libdl dependency is for plugin support. (BZ 889134) */
|
|
-INPUT ( %{_libdir}/libbfd.a -liberty -lz -ldl )
|
|
|
|
|
|
+INPUT ( %{_libdir}/libbfd.a %{_libdir}/libsframe.a -liberty -lz -ldl )
|
|
EOH
|
|
EOH
|
|
|
|
|
|
tee %{buildroot}%{_libdir}/libopcodes.so <<EOH
|
|
tee %{buildroot}%{_libdir}/libopcodes.so <<EOH
|
|
@@ -717,6 +721,9 @@ exit 0
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.42-2
|
|
|
|
+- updated Patch00.
|
|
|
|
+
|
|
* Sat Jun 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.42-1
|
|
* Sat Jun 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.42-1
|
|
- updated to 2.42.
|
|
- updated to 2.42.
|
|
- updated Patch00.
|
|
- updated Patch00.
|