From cd2fda53d22e41751a2fe06c1649b749039a9690 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Jun 26 2012 10:45:37 +0000 Subject: Honour %{powerpc64} (#834651) --- diff --git a/binutils.spec b/binutils.spec index f4c2e8d..0c1a477 100644 --- a/binutils.spec +++ b/binutils.spec @@ -17,7 +17,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.22.52.0.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -179,6 +179,10 @@ do done touch */configure +%ifarch %{power64} +%define _target_platform %{_arch}-%{_vendor}-%{_host_os} +%endif + %build echo target is %{binutils_target} export CFLAGS="$RPM_OPT_FLAGS" @@ -292,7 +296,7 @@ rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.la # Sanity check --enable-64-bit-bfd really works. 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 ppc64 s390 s390x sh3 sh4 sparc sparc64 arm +%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include ~;}' \ -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)/' \ @@ -449,6 +453,9 @@ exit 0 %endif # %{isnative} %changelog +* Tue Jun 26 2012 Nick Clifton - 2.22.52.0.1-11 +- Honour %{powerpc64} (#834651) + * Fri Mar 16 2012 Jakub Jelinek - 2.22.52.0.1-10 - Fix up handling of hidden ifunc relocs on i?86