The package rpms/avr-binutils.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/avr-binutils.git/commit/?id=a418b....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit 3c442d9459c8f0e85da471cf9d5ed40b36aab725
Merge: 87042fb f11269e
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Aug 4 12:44:49 2021 +0200
Merge branch 'rawhide' into f33
commit f11269eb6f96cfd37a7bd491c290f556db9b30f6
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Aug 4 12:34:57 2021 +0200
updated to 2.37
diff --git a/.gitignore b/.gitignore
index 8c8d123..c837319 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ binutils-2.20.tar.bz2
/binutils-2.35.tar.xz
/binutils-2.36.tar.xz
/binutils-2.36.1.tar.xz
+/binutils-2.37.tar.xz
diff --git a/avr-binutils-config.patch b/avr-binutils-config.patch
index 8456584..68e760c 100644
--- a/avr-binutils-config.patch
+++ b/avr-binutils-config.patch
@@ -1,19 +1,6 @@
-diff -Nrup a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
---- a/libiberty/aclocal.m4 2019-01-19 09:01:34.000000000 -0700
-+++ b/libiberty/aclocal.m4 2020-01-09 22:00:27.183312982 -0700
-@@ -147,7 +147,7 @@ if test $ac_cv_os_cray = yes; then
- fi
-
- AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
--[AC_TRY_RUN([find_stack_direction ()
-+[AC_TRY_RUN([__attribute__ ((noclone,noinline)) find_stack_direction ()
- {
- static char *addr = 0;
- auto char dummy;
-diff --git a/config/intdiv0.m4 b/config/intdiv0.m4
-index 55dddcf1..ba906efc 100644
---- a/config/intdiv0.m4
-+++ b/config/intdiv0.m4
+diff -up binutils-2.37/config/intdiv0.m4.bucfg binutils-2.37/config/intdiv0.m4
+--- binutils-2.37/config/intdiv0.m4.bucfg 2021-07-08 13:37:19.000000000 +0200
++++ binutils-2.37/config/intdiv0.m4 2021-07-20 23:32:54.614329820 +0200
@@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig;
exit (sig != SIGFPE);
}
@@ -29,16 +16,17 @@ index 55dddcf1..ba906efc 100644
int main ()
{
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index f1ce7601..fc20d228 100644
---- a/libiberty/configure.ac
-+++ b/libiberty/configure.ac
-@@ -661,7 +661,7 @@ if test -z "${setobjs}"; then
- for v in $vars; do
- AC_MSG_CHECKING([for $v])
- AC_CACHE_VAL(libiberty_cv_var_$v,
-- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int *p;]],[[extern int $v []; p = $v;]])],
-+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[__attribute__ ((used)) int *p;]],[[extern int
$v []; p = $v;]])],
- [eval "libiberty_cv_var_$v=yes"],
- [eval "libiberty_cv_var_$v=no"])])
- if eval "test \"`echo '$libiberty_cv_var_'$v`\" = yes";
then
+diff -up binutils-2.37/libiberty/acinclude.m4.bucfg binutils-2.37/libiberty/acinclude.m4
+--- binutils-2.37/libiberty/acinclude.m4.bucfg 2021-07-20 23:33:34.232852534 +0200
++++ binutils-2.37/libiberty/acinclude.m4 2021-07-20 23:33:50.456657087 +0200
+@@ -157,7 +157,7 @@ if test $ac_cv_os_cray = yes; then
+ fi
+
+ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+-[AC_TRY_RUN([find_stack_direction ()
++[AC_TRY_RUN([__attribute__ ((noclone,noinline)) find_stack_direction ()
+ {
+ static char *addr = 0;
+ auto char dummy;
+diff -up binutils-2.37/libiberty/aclocal.m4.bucfg binutils-2.37/libiberty/aclocal.m4
+diff -up binutils-2.37/libiberty/configure.ac.bucfg binutils-2.37/libiberty/configure.ac
diff --git a/avr-binutils.spec b/avr-binutils.spec
index c0be628..af686e0 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -1,8 +1,8 @@
%define target avr
Name: %{target}-binutils
-Version: 2.36.1
-Release: 2%{?dist}
+Version: 2.37
+Release: 1%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -17,7 +17,7 @@ BuildRequires: gawk texinfo gcc
#for autoreconf:
BuildRequires: gettext-devel automake
BuildRequires: autoconf = 2.69
-BuildRequires: make
+BuildRequires: make zlib-devel
Provides: bundled(libiberty)
%description
@@ -52,6 +52,7 @@ mkdir -p build
pushd build
CFLAGS="$RPM_OPT_FLAGS" ../binutils-%{version}/configure --prefix=%{_prefix} \
--libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} \
+ --with-system-zlib \
--target=%{target} --disable-werror --disable-nls
make %{?_smp_mflags}
popd
@@ -83,6 +84,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
$RPM_BUILD_ROOT%{_libdir}/bfd-plugins/lib
%changelog
+* Wed Aug 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.37-1
+- updated to 2.37
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.36.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 959daa6..b8c6109 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (binutils-2.36.1.tar.xz) =
cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
+SHA512 (binutils-2.37.tar.xz) =
5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
commit 668e6377898236b14659438f05eff4cc3a254611
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Aug 4 12:24:16 2021 +0200
update sources from ftp to https
diff --git a/avr-binutils.spec b/avr-binutils.spec
index ec64bd3..c0be628 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -7,7 +7,7 @@ Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
URL:
http://www.gnu.org/software/binutils/
-Source0:
ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{version}.tar.xz
+Source0:
https://ftp.gnu.org/pub/gnu/binutils/binutils-%{version}.tar.xz
Source1: README.fedora
#add widespread options to avr-size: --format=avr -mcu=XX
Patch1:
http://distribute.atmel.no/tools/opensource/avr-gcc/binutils-2.20.1/30-bi...
commit eb775e41736226a6b84d34dc0922cb827baebbf9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 18:17:07 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/avr-binutils.spec b/avr-binutils.spec
index 1ddb548..ec64bd3 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -2,7 +2,7 @@
Name: %{target}-binutils
Version: 2.36.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -83,6 +83,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
$RPM_BUILD_ROOT%{_libdir}/bfd-plugins/lib
%changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.36.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36.1-1
- updated to 2.36.1
commit 0a37dea413ec3c37fdf3e6f82a41d0947dbda1f8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 13:20:56 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit a418b5b71b66c6bac14d70e9a476019894ca26da
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Tue May 4 22:41:51 2021 +0200
skip s390x check for now
diff --git a/avr-binutils.spec b/avr-binutils.spec
index f598a65..1ddb548 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -58,7 +58,10 @@ popd
%check
cd build
+%ifnarch s390x
make check
+%endif
+echo "completed"
%install
rm -rf $RPM_BUILD_ROOT
commit 001d0891c212e9651167392415540b2bd0087020
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Tue May 4 21:11:19 2021 +0200
updated to 2.36.1
diff --git a/.gitignore b/.gitignore
index 29887e2..8c8d123 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ binutils-2.20.tar.bz2
/binutils-2.32.tar.xz
/binutils-2.35.tar.xz
/binutils-2.36.tar.xz
+/binutils-2.36.1.tar.xz
diff --git a/avr-binutils.spec b/avr-binutils.spec
index df5373f..f598a65 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -1,7 +1,7 @@
%define target avr
Name: %{target}-binutils
-Version: 2.36
+Version: 2.36.1
Release: 1%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
@@ -80,6 +80,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
$RPM_BUILD_ROOT%{_libdir}/bfd-plugins/lib
%changelog
+* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36.1-1
+- updated to 2.36.1
+
* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36-1
- updated to 2.36
diff --git a/sources b/sources
index 25b1bb7..959daa6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (binutils-2.36.tar.xz) =
0b89b70d4ad5cfe5bd0011dc7e342ae9de96efdbfc3442a0d6b5f7660e38bbcad36f2c72ba8f074323f02bde022ff1cd723ae99f0ea55cf94ee2dbbc0e4efdb2
+SHA512 (binutils-2.36.1.tar.xz) =
cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
commit 72776338de6b432eb2a1d96835dac5dda677c405
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Tue May 4 19:56:31 2021 +0200
new version, new files
diff --git a/avr-binutils.spec b/avr-binutils.spec
index 5bd7541..df5373f 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -69,9 +69,7 @@ popd
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-{dlltool,windres}.1
# we don't want these as we are a cross version
rm -r $RPM_BUILD_ROOT%{_infodir}
-rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
-
-
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libdir}/bfd-plugins/libdep* ||:
%files
%license binutils-%{version}/COPYING binutils-%{version}/COPYING.LIB
commit 6509f20c747a5c220e00d027c893c5566e841347
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Tue May 4 19:26:52 2021 +0200
updated to 2.36
diff --git a/.gitignore b/.gitignore
index 0a5783f..29887e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ binutils-2.20.tar.bz2
/binutils-2.30.tar.xz
/binutils-2.32.tar.xz
/binutils-2.35.tar.xz
+/binutils-2.36.tar.xz
diff --git a/avr-binutils.spec b/avr-binutils.spec
index 9dde9b0..5bd7541 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -1,8 +1,8 @@
%define target avr
Name: %{target}-binutils
-Version: 2.35
-Release: 5%{?dist}
+Version: 2.36
+Release: 1%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -82,6 +82,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
%changelog
+* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36-1
+- updated to 2.36
+
* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-5
- bump release for rebuild
@@ -95,7 +98,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 09 2020 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-1
-- updated to 2.3
+- updated to 2.35
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.32-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index e0a77b1..25b1bb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (binutils-2.35.tar.xz) =
9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
+SHA512 (binutils-2.36.tar.xz) =
0b89b70d4ad5cfe5bd0011dc7e342ae9de96efdbfc3442a0d6b5f7660e38bbcad36f2c72ba8f074323f02bde022ff1cd723ae99f0ea55cf94ee2dbbc0e4efdb2
commit f328794d14c300e6d889092f1d685411f57f337c
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Tue May 4 16:20:13 2021 +0200
bump release for rebuild
diff --git a/avr-binutils.spec b/avr-binutils.spec
index 7397df7..9dde9b0 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -2,7 +2,7 @@
Name: %{target}-binutils
Version: 2.35
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -82,6 +82,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
%changelog
+* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-5
+- bump release for rebuild
+
* Sun Apr 11 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-4
- add explicit requirement for autoconf 2.69
commit f7374be859ecad87ccd45c1c1c4b8a24f84bb82b
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Sun Apr 11 14:56:42 2021 +0200
add explicit requirement for autoconf 2.69
diff --git a/avr-binutils.spec b/avr-binutils.spec
index 404106e..7397df7 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -2,7 +2,7 @@
Name: %{target}-binutils
Version: 2.35
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -15,7 +15,8 @@ Patch2: avr-binutils-config.patch
BuildRequires: gawk texinfo gcc
#for autoreconf:
-BuildRequires: gettext-devel autoconf automake
+BuildRequires: gettext-devel automake
+BuildRequires: autoconf = 2.69
BuildRequires: make
Provides: bundled(libiberty)
@@ -81,6 +82,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
%changelog
+* Sun Apr 11 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-4
+- add explicit requirement for autoconf 2.69
+
* Tue Feb 02 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-3
- fix --format=avr option (#1907907)
commit 0eaf858fb486e936a43a5661374c965a4d09215f
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Tue Feb 2 19:21:03 2021 +0100
fix --format=avr option (#1907907)
diff --git a/30-binutils-2.20.1-avr-size.patch b/30-binutils-2.20.1-avr-size.patch
index 66210ed..d0c0d60 100644
--- a/30-binutils-2.20.1-avr-size.patch
+++ b/30-binutils-2.20.1-avr-size.patch
@@ -297,8 +297,8 @@ diff -up avr-binutils-2.35/binutils-2.35/binutils/size.c.avr-size
avr-binutils-2
case 's':
selected_output_format = FORMAT_SYSV;
break;
-+ case 'C':
-+ case 'c':
++ case 'A':
++ case 'a':
+ selected_output_format = FORMAT_AVR;
+ break;
case 'G':
diff --git a/avr-binutils.spec b/avr-binutils.spec
index 86ae94f..404106e 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -2,7 +2,7 @@
Name: %{target}-binutils
Version: 2.35
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -81,6 +81,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
%changelog
+* Tue Feb 02 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-3
+- fix --format=avr option (#1907907)
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.35-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 163b12b587f25f44b884a10c3241c2fabe44d2ad
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 00:49:39 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/avr-binutils.spec b/avr-binutils.spec
index 23745d3..86ae94f 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -2,7 +2,7 @@
Name: %{target}-binutils
Version: 2.35
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -81,6 +81,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.35-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Nov 09 2020 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-1
- updated to 2.3
commit 651e38d6c9db819370db38d5df502e853f1c2381
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Thu Dec 17 02:38:41 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/avr-binutils.spec b/avr-binutils.spec
index b9a6149..23745d3 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -16,6 +16,7 @@ Patch2: avr-binutils-config.patch
BuildRequires: gawk texinfo gcc
#for autoreconf:
BuildRequires: gettext-devel autoconf automake
+BuildRequires: make
Provides: bundled(libiberty)
%description
commit 023e0abbe07565787f9f3e69a344b3aae76d72e6
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Mon Nov 9 16:46:14 2020 +0100
updated to 2.3
diff --git a/.gitignore b/.gitignore
index 63a92b9..0a5783f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ binutils-2.20.tar.bz2
/binutils-2.27.tar.bz2
/binutils-2.30.tar.xz
/binutils-2.32.tar.xz
+/binutils-2.35.tar.xz
diff --git a/30-binutils-2.20.1-avr-size.patch b/30-binutils-2.20.1-avr-size.patch
index 3e32ce4..66210ed 100644
--- a/30-binutils-2.20.1-avr-size.patch
+++ b/30-binutils-2.20.1-avr-size.patch
@@ -1,52 +1,17 @@
-diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2.32/binutils-2.32/binutils/size.c
---- avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size 2019-01-19
17:01:33.000000000 +0100
-+++ avr-binutils-2.32/binutils-2.32/binutils/size.c 2019-02-04 10:24:30.343733083 +0100
-@@ -34,10 +34,31 @@
- #include "getopt.h"
- #include "bucomm.h"
-
--#ifndef BSD_DEFAULT
--#define BSD_DEFAULT 1
-+typedef enum
-+{
-+ format_sysv = 0,
-+ format_bsd = 1,
-+ format_avr = 2,
-+} format_type_t;
-+
-+
-+/* Set the default format. */
-+#define FORMAT_DEFAULT_SYSV 0
-+#define FORMAT_DEFAULT_BSD 1
-+#define FORMAT_DEFAULT_AVR 0
-+
-+#if FORMAT_DEFAULT_SYSV
-+ #define FORMAT_DEFAULT format_sysv
-+ #define FORMAT_NAME "sysv"
-+#elif FORMAT_DEFAULT_BSD
-+ #define FORMAT_DEFAULT format_bsd
-+ #define FORMAT_NAME "berkeley"
-+#elif FORMAT_DEFAULT_AVR
-+ #define FORMAT_DEFAULT format_avr
-+ #define FORMAT_NAME "avr"
- #endif
-
-+
- /* Program options. */
-
- static enum
-@@ -46,9 +67,8 @@ static enum
- }
- radix = decimal;
-
--/* 0 means use AT&T-style output. */
--static int berkeley_format = BSD_DEFAULT;
-
-+format_type_t format = FORMAT_DEFAULT;
- static int show_version = 0;
- static int show_help = 0;
- static int show_totals = 0;
-@@ -62,6 +82,246 @@ static bfd_size_type total_textsize;
+diff -up avr-binutils-2.35/binutils-2.35/binutils/size.c.avr-size
avr-binutils-2.35/binutils-2.35/binutils/size.c
+--- avr-binutils-2.35/binutils-2.35/binutils/size.c.avr-size 2020-07-24
11:12:19.000000000 +0200
++++ avr-binutils-2.35/binutils-2.35/binutils/size.c 2020-11-09 16:42:59.484661508 +0100
+@@ -51,7 +51,8 @@ enum output_format
+ {
+ FORMAT_BERKLEY,
+ FORMAT_SYSV,
+- FORMAT_GNU
++ FORMAT_GNU,
++ FORMAT_AVR
+ };
+ static enum output_format selected_output_format =
+ #if BSD_DEFAULT
+@@ -74,6 +75,246 @@ static bfd_size_type total_textsize;
/* Program exit status. */
static int return_code = 0;
@@ -293,30 +258,17 @@ diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2
static char *target = NULL;
/* Forward declarations. */
-@@ -77,7 +337,8 @@ usage (FILE *stream, int status)
+@@ -89,7 +330,8 @@ usage (FILE *stream, int status)
fprintf (stream, _(" Displays the sizes of sections inside binary
files\n"));
fprintf (stream, _(" If no input file(s) are specified, a.out is
assumed\n"));
fprintf (stream, _(" The options are:\n\
-- -A|-B --format={sysv|berkeley} Select output style (default is %s)\n\
-+ -A|-B|-C --format={sysv|berkeley|avr} Select output style (default is %s)\n\
+- -A|-B|-G --format={sysv|berkeley|gnu} Select output style (default is %s)\n\
++ -A|-B|-C|-G --format={sysv|berkeley|avr|gnu} Select output style (default is %s)\n\
+ --mcu=<avrmcu> MCU name for AVR format only\n\
-o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\
-t --totals Display the total sizes (Berkeley only)\n\
--common Display total size for *COM* syms\n\
-@@ -86,11 +347,7 @@ usage (FILE *stream, int status)
- -h --help Display this information\n\
- -v --version Display the program's version\n\
- \n"),
--#if BSD_DEFAULT
-- "berkeley"
--#else
-- "sysv"
--#endif
-+FORMAT_NAME
- );
- list_supported_targets (program_name, stream);
- if (REPORT_BUGS_TO[0] && status == 0)
-@@ -101,6 +358,7 @@ usage (FILE *stream, int status)
+@@ -113,6 +355,7 @@ usage (FILE *stream, int status)
#define OPTION_FORMAT (200)
#define OPTION_RADIX (OPTION_FORMAT + 1)
#define OPTION_TARGET (OPTION_RADIX + 1)
@@ -324,7 +276,7 @@ diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2
static struct option long_options[] =
{
-@@ -108,6 +366,7 @@ static struct option long_options[] =
+@@ -120,6 +363,7 @@ static struct option long_options[] =
{"format", required_argument, 0, OPTION_FORMAT},
{"radix", required_argument, 0, OPTION_RADIX},
{"target", required_argument, 0, OPTION_TARGET},
@@ -332,34 +284,27 @@ diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2
{"totals", no_argument, &show_totals, 1},
{"version", no_argument, &show_version, 1},
{"help", no_argument, &show_help, 1},
-@@ -141,7 +400,7 @@ main (int argc, char **argv)
+@@ -153,7 +397,7 @@ main (int argc, char **argv)
fatal (_("fatal error: libbfd ABI mismatch"));
set_default_bfd_target ();
-- while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options,
-+ while ((c = getopt_long (argc, argv, "ABCHhVvdfotx", long_options,
+- while ((c = getopt_long (argc, argv, "ABGHhVvdfotx", long_options,
++ while ((c = getopt_long (argc, argv, "ABCGHhVvdfotx", long_options,
(int *) 0)) != EOF)
switch (c)
{
-@@ -150,11 +409,15 @@ main (int argc, char **argv)
- {
- case 'B':
- case 'b':
-- berkeley_format = 1;
-+ format = format_bsd;
- break;
- case 'S':
+@@ -168,6 +412,10 @@ main (int argc, char **argv)
case 's':
-- berkeley_format = 0;
-+ format = format_sysv;
-+ break;
-+ case 'A':
-+ case 'a':
-+ format = format_avr;
+ selected_output_format = FORMAT_SYSV;
break;
- default:
- non_fatal (_("invalid argument to --format: %s"), optarg);
-@@ -162,6 +425,10 @@ main (int argc, char **argv)
++ case 'C':
++ case 'c':
++ selected_output_format = FORMAT_AVR;
++ break;
+ case 'G':
+ case 'g':
+ selected_output_format = FORMAT_GNU;
+@@ -178,6 +426,10 @@ main (int argc, char **argv)
}
break;
@@ -370,34 +315,18 @@ diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2
case OPTION_TARGET:
target = optarg;
break;
-@@ -190,11 +457,14 @@ main (int argc, char **argv)
- break;
-
- case 'A':
-- berkeley_format = 0;
-+ format = format_sysv;
- break;
+@@ -211,6 +463,9 @@ main (int argc, char **argv)
case 'B':
-- berkeley_format = 1;
-+ format = format_bsd;
+ selected_output_format = FORMAT_BERKLEY;
break;
+ case 'C':
-+ format = format_avr;
-+ break;
- case 'v':
- case 'V':
- show_version = 1;
-@@ -240,7 +510,7 @@ main (int argc, char **argv)
- for (; optind < argc;)
- display_file (argv[optind++]);
-
-- if (show_totals && berkeley_format)
-+ if (show_totals && format == format_bsd)
- {
- bfd_size_type total = total_textsize + total_datasize + total_bsssize;
-
-@@ -606,13 +876,117 @@ print_sysv_format (bfd *file)
- printf ("\n\n");
++ selected_output_format = FORMAT_AVR;
++ break;
+ case 'G':
+ selected_output_format = FORMAT_GNU;
+ break;
+@@ -317,6 +572,100 @@ calculate_common_size (bfd *abfd)
+ free (syms);
}
+
@@ -420,7 +349,6 @@ diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2
+}
+
+
-+
+static void
+print_avr_format (bfd *file)
+{
@@ -446,17 +374,17 @@ diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2
+ }
+
+ if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
-+ datasize = bfd_section_size (file, section);
++ datasize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
-+ textsize = bfd_section_size (file, section);
++ textsize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
-+ bsssize = bfd_section_size (file, section);
++ bsssize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
-+ bootloadersize = bfd_section_size (file, section);
++ bootloadersize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
-+ noinitsize = bfd_section_size (file, section);
++ noinitsize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
-+ eepromsize = bfd_section_size (file, section);
++ eepromsize = bfd_section_size (section);
+
+ bfd_size_type text = textsize + datasize + bootloadersize;
+ bfd_size_type data = datasize + bsssize + noinitsize;
@@ -495,26 +423,15 @@ diff -up avr-binutils-2.32/binutils-2.32/binutils/size.c.avr-size
avr-binutils-2
+}
+
+
+ /* Display stats on file or archive member ABFD. */
+
static void
- print_sizes (bfd *file)
- {
- if (show_common)
+@@ -663,6 +1012,8 @@ print_sizes (bfd *file)
calculate_common_size (file);
-- if (berkeley_format)
-- print_berkeley_format (file);
-- else
-- print_sysv_format (file);
-+ switch (format)
-+ {
-+ case format_sysv:
-+ print_sysv_format (file);
-+ break;
-+ case format_bsd:
-+ print_berkeley_format (file);
-+ break;
-+ case format_avr:
-+ default:
-+ print_avr_format (file);
-+ break;
-+ }
+ if (selected_output_format == FORMAT_SYSV)
+ print_sysv_format (file);
++ else if (selected_output_format == FORMAT_AVR)
++ print_avr_format (file);
+ else
+ print_berkeley_or_gnu_format (file);
}
diff --git a/avr-binutils.spec b/avr-binutils.spec
index a830f3d..b9a6149 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -1,8 +1,8 @@
%define target avr
Name: %{target}-binutils
-Version: 2.32
-Release: 5%{?dist}
+Version: 2.35
+Release: 1%{?dist}
Epoch: 1
Summary: Cross Compiling GNU binutils targeted at %{target}
License: GPLv2+
@@ -80,6 +80,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||:
%changelog
+* Mon Nov 09 2020 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-1
+- updated to 2.3
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.32-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index b061c92..e0a77b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (binutils-2.32.tar.xz) =
d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
+SHA512 (binutils-2.35.tar.xz) =
9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786