SHA256
3
0
forked from pool/glibc

Accepting request 203481 from home:Andreas_Schwab:Factory

- Depend on gcc defaults for base powerpc optimisations (bnc#844824)

OBS-URL: https://build.opensuse.org/request/show/203481
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=314
This commit is contained in:
Andreas Schwab 2013-10-16 12:30:46 +00:00 committed by Git OBS Bridge
parent f765de7465
commit 65171dba32
6 changed files with 39 additions and 15 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 14 09:32:44 UTC 2013 - schwab@suse.de
- Depend on gcc defaults for base powerpc optimisations (bnc#844824)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de

View File

@ -78,11 +78,11 @@ BuildRequires: gd-devel
%ifarch ppc ppc64 %ifarch ppc ppc64
%define optimize_power 1 %define optimize_power 1
%ifarch ppc %ifarch ppc
%define powerpc_optimize_base power3 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power3 %define powerpc_optimize_tune power3
%define powerpc_optimize_cpu_power4 %{normal_build} %define powerpc_optimize_cpu_power4 %{normal_build}
%else %else
%define powerpc_optimize_base power4 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power5 %define powerpc_optimize_tune power5
%define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power4 0
%endif %endif
@ -92,7 +92,7 @@ BuildRequires: gd-devel
%define powerpc_optimize_cpu_cell 0 %define powerpc_optimize_cpu_cell 0
%else %else
%define optimize_power 0 %define optimize_power 0
%define powerpc_optimize_base 0 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power4 0
%define powerpc_optimize_cpu_power6 0 %define powerpc_optimize_cpu_power6 0
%define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_power7 0
@ -658,8 +658,11 @@ configure_and_build_glibc() {
# Build POWER-optimized glibc # Build POWER-optimized glibc
# #
# First, base build: # First, base build:
pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} -mtune=%{powerpc_optimize_tune}" pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}"
%if %{powerpc_optimize_base} != "power3" %if "%{powerpc_optimize_base}" != ""
pBuildFlags+=" -mcpu=%{powerpc_optimize_base}"
%endif
%if "%{powerpc_optimize_base}" != ""
configure_and_build_glibc base "$pBuildFlags" "$add_ons" --with-cpu=%{powerpc_optimize_base} configure_and_build_glibc base "$pBuildFlags" "$add_ons" --with-cpu=%{powerpc_optimize_base}
%else %else
# Use no default CPU # Use no default CPU

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 14 09:32:44 UTC 2013 - schwab@suse.de
- Depend on gcc defaults for base powerpc optimisations (bnc#844824)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de

View File

@ -77,11 +77,11 @@ BuildRequires: gd-devel
%ifarch ppc ppc64 %ifarch ppc ppc64
%define optimize_power 1 %define optimize_power 1
%ifarch ppc %ifarch ppc
%define powerpc_optimize_base power3 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power3 %define powerpc_optimize_tune power3
%define powerpc_optimize_cpu_power4 %{normal_build} %define powerpc_optimize_cpu_power4 %{normal_build}
%else %else
%define powerpc_optimize_base power4 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power5 %define powerpc_optimize_tune power5
%define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power4 0
%endif %endif
@ -91,7 +91,7 @@ BuildRequires: gd-devel
%define powerpc_optimize_cpu_cell 0 %define powerpc_optimize_cpu_cell 0
%else %else
%define optimize_power 0 %define optimize_power 0
%define powerpc_optimize_base 0 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power4 0
%define powerpc_optimize_cpu_power6 0 %define powerpc_optimize_cpu_power6 0
%define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_power7 0
@ -658,8 +658,11 @@ configure_and_build_glibc() {
# Build POWER-optimized glibc # Build POWER-optimized glibc
# #
# First, base build: # First, base build:
pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} -mtune=%{powerpc_optimize_tune}" pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}"
%if %{powerpc_optimize_base} != "power3" %if "%{powerpc_optimize_base}" != ""
pBuildFlags+=" -mcpu=%{powerpc_optimize_base}"
%endif
%if "%{powerpc_optimize_base}" != ""
configure_and_build_glibc base "$pBuildFlags" "$add_ons" --with-cpu=%{powerpc_optimize_base} configure_and_build_glibc base "$pBuildFlags" "$add_ons" --with-cpu=%{powerpc_optimize_base}
%else %else
# Use no default CPU # Use no default CPU

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 14 09:32:44 UTC 2013 - schwab@suse.de
- Depend on gcc defaults for base powerpc optimisations (bnc#844824)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de

View File

@ -78,11 +78,11 @@ BuildRequires: gd-devel
%ifarch ppc ppc64 %ifarch ppc ppc64
%define optimize_power 1 %define optimize_power 1
%ifarch ppc %ifarch ppc
%define powerpc_optimize_base power3 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power3 %define powerpc_optimize_tune power3
%define powerpc_optimize_cpu_power4 %{normal_build} %define powerpc_optimize_cpu_power4 %{normal_build}
%else %else
%define powerpc_optimize_base power4 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power5 %define powerpc_optimize_tune power5
%define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power4 0
%endif %endif
@ -92,7 +92,7 @@ BuildRequires: gd-devel
%define powerpc_optimize_cpu_cell 0 %define powerpc_optimize_cpu_cell 0
%else %else
%define optimize_power 0 %define optimize_power 0
%define powerpc_optimize_base 0 %define powerpc_optimize_base %{nil}
%define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power4 0
%define powerpc_optimize_cpu_power6 0 %define powerpc_optimize_cpu_power6 0
%define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_power7 0
@ -658,8 +658,11 @@ configure_and_build_glibc() {
# Build POWER-optimized glibc # Build POWER-optimized glibc
# #
# First, base build: # First, base build:
pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} -mtune=%{powerpc_optimize_tune}" pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}"
%if %{powerpc_optimize_base} != "power3" %if "%{powerpc_optimize_base}" != ""
pBuildFlags+=" -mcpu=%{powerpc_optimize_base}"
%endif
%if "%{powerpc_optimize_base}" != ""
configure_and_build_glibc base "$pBuildFlags" "$add_ons" --with-cpu=%{powerpc_optimize_base} configure_and_build_glibc base "$pBuildFlags" "$add_ons" --with-cpu=%{powerpc_optimize_base}
%else %else
# Use no default CPU # Use no default CPU