diff --git a/0001-Use-64bit-gcc-for-32bit-ppc-sparc.patch b/0001-Use-64bit-gcc-for-32bit-ppc-sparc.patch deleted file mode 100644 index 13887b6..0000000 --- a/0001-Use-64bit-gcc-for-32bit-ppc-sparc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From edd8b56b3181853ebba727e4ab3a09f86092bb9b Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Mon, 17 Sep 2012 17:07:19 -0400 -Subject: [PATCH] Use 64bit gcc for 32bit ppc + sparc - -Fedora only packages the 64 bit cross compilers, so it's our only -option. Not intended for upstream. - -Signed-off-by: Cole Robinson ---- - config/scripts/switch-arch | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch -index a9c911b..c1d1dbb 100755 ---- a/config/scripts/switch-arch -+++ b/config/scripts/switch-arch -@@ -230,7 +230,7 @@ for ARCH in $arch_list; do - ;; - - ppc) -- select_prefix powerpc -+ select_prefix powerpc64 - if [ "$unix" = "no" ]; then - CFLAGS="-m32 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" - AS_FLAGS="-m32" -@@ -248,7 +248,7 @@ for ARCH in $arch_list; do - ;; - - sparc32) -- select_prefix sparc -+ select_prefix sparc64 - CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" - AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" - ;; --- -1.7.11.2 - diff --git a/openbios.spec b/openbios.spec index dc79b23..6db2507 100644 --- a/openbios.spec +++ b/openbios.spec @@ -1,4 +1,4 @@ -%global svnrel 1353 +%global svnrel 1378 %global tarver 1.1 # Disable unhelpful RPM test. @@ -22,10 +22,6 @@ BuildArch: noarch # rm -r $name-$tarver Source0: %{name}-%{tarver}-svn%{svnrel}.tar.gz -# Use 64bit gcc for 32bit ppc + sparc -# keep: Not suitable for upstream, change is specific to Fedora cross-gcc -Patch0: 0001-Use-64bit-gcc-for-32bit-ppc-sparc.patch - # Note that these packages build 32 bit binaries with the -m32 flag. BuildRequires: gcc-powerpc64-linux-gnu BuildRequires: gcc-sparc64-linux-gnu @@ -65,7 +61,6 @@ such as coreboot or U-Boot. %prep %setup -q -n %{name}-%{tarver} -%patch0 -p1 %build @@ -96,6 +91,10 @@ cp -a obj-sparc64/openbios-builtin.elf $qemudir/openbios-sparc64 %changelog +* Fri Feb 05 2016 Cole Robinson 1.1.svn1378-1 +- Update to r1378 +- Fix build with latest cross-gcc (bz 1282890) + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.svn1353-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index ff3f7c9..6c97c70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d67f76f0d84f365f9abfcac640a19db openbios-1.1-svn1353.tar.gz +50fa48759a2b452480cd53cff29642ea openbios-1.1-svn1378.tar.gz