- Update to r1378

- Fix build with latest cross-gcc (bz 1282890)
epel9
Cole Robinson 9 years ago
parent ccaa196368
commit bdc8b12fbe

@ -1,38 +0,0 @@
From edd8b56b3181853ebba727e4ab3a09f86092bb9b Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
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 <crobinso@redhat.com>
---
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

@ -1,4 +1,4 @@
%global svnrel 1353 %global svnrel 1378
%global tarver 1.1 %global tarver 1.1
# Disable unhelpful RPM test. # Disable unhelpful RPM test.
@ -22,10 +22,6 @@ BuildArch: noarch
# rm -r $name-$tarver # rm -r $name-$tarver
Source0: %{name}-%{tarver}-svn%{svnrel}.tar.gz 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. # Note that these packages build 32 bit binaries with the -m32 flag.
BuildRequires: gcc-powerpc64-linux-gnu BuildRequires: gcc-powerpc64-linux-gnu
BuildRequires: gcc-sparc64-linux-gnu BuildRequires: gcc-sparc64-linux-gnu
@ -65,7 +61,6 @@ such as coreboot or U-Boot.
%prep %prep
%setup -q -n %{name}-%{tarver} %setup -q -n %{name}-%{tarver}
%patch0 -p1
%build %build
@ -96,6 +91,10 @@ cp -a obj-sparc64/openbios-builtin.elf $qemudir/openbios-sparc64
%changelog %changelog
* Fri Feb 05 2016 Cole Robinson <crobinso@redhat.com> 1.1.svn1378-1
- Update to r1378
- Fix build with latest cross-gcc (bz 1282890)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.svn1353-2 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.svn1353-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

@ -1 +1 @@
3d67f76f0d84f365f9abfcac640a19db openbios-1.1-svn1353.tar.gz 50fa48759a2b452480cd53cff29642ea openbios-1.1-svn1378.tar.gz

Loading…
Cancel
Save