- Incorporate ppc64p7 arch changes (#854250)

This commit is contained in:
Jeff Law 2012-09-04 11:33:31 -06:00
parent 7f32dad8b0
commit 98dddaf805

View File

@ -16,10 +16,10 @@
%else %else
%define buildpower6 0 %define buildpower6 0
%endif %endif
%define rtkaioarches %{ix86} x86_64 ppc ppc64 s390 s390x %define rtkaioarches %{ix86} x86_64 ppc %{power64} s390 s390x
%define biarcharches %{ix86} x86_64 ppc ppc64 s390 s390x %define biarcharches %{ix86} x86_64 ppc %{power64} s390 s390x
%define debuginfocommonarches %{biarcharches} alpha alphaev6 %define debuginfocommonarches %{biarcharches} alpha alphaev6
%define multiarcharches ppc ppc64 %{ix86} x86_64 %{sparc} %define multiarcharches ppc %{power64} %{ix86} x86_64 %{sparc}
%define systemtaparches %{ix86} x86_64 %define systemtaparches %{ix86} x86_64
# Remove -s to get verbose output. # Remove -s to get verbose output.
%define silentrules PARALLELMFLAGS=-s %define silentrules PARALLELMFLAGS=-s
@ -227,9 +227,12 @@ Conflicts: kernel < %{enablekernel}
%ifarch %{arm} %ifarch %{arm}
%define target %{_target_cpu}-redhat-linuxeabi %define target %{_target_cpu}-redhat-linuxeabi
%endif %endif
%ifarch %{power64}
%define target ppc64-redhat-linux
%endif
%ifarch %{multiarcharches} %ifarch %{multiarcharches}
# Need STT_IFUNC support # Need STT_IFUNC support
%ifarch ppc ppc64 %ifarch ppc %{power64}
BuildRequires: binutils >= 2.20.51.0.2 BuildRequires: binutils >= 2.20.51.0.2
Conflicts: binutils < 2.20.51.0.2 Conflicts: binutils < 2.20.51.0.2
%else %else
@ -531,7 +534,7 @@ BuildFlags="-mcpu=niagara -mvis -fcall-used-g6"
GCC="gcc -m64" GCC="gcc -m64"
GXX="g++ -m64" GXX="g++ -m64"
%endif %endif
%ifarch ppc64 %ifarch %{power64}
BuildFlags="-mno-minimal-toc" BuildFlags="-mno-minimal-toc"
GCC="gcc -m64" GCC="gcc -m64"
GXX="g++ -m64" GXX="g++ -m64"
@ -573,6 +576,9 @@ configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
--enable-obsolete-rpc \ --enable-obsolete-rpc \
%ifarch %{systemtaparches} %ifarch %{systemtaparches}
--enable-systemtap \ --enable-systemtap \
%endif
%ifarch ppc64p7
--with-cpu=power7 \
%endif %endif
--disable-profile --enable-nss-crypt || --disable-profile --enable-nss-crypt ||
{ cat config.log; false; } { cat config.log; false; }
@ -1343,6 +1349,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Sep 4 2012 Jeff Law <law@redhat.com> - 2.16-12
- Incorporate ppc64p7 arch changes (#854250)
* Thu Aug 30 2012 Jeff Law <law@redhat.com> - 2.16.90-7 * Thu Aug 30 2012 Jeff Law <law@redhat.com> - 2.16.90-7
- Resync with upstream sources. - Resync with upstream sources.