From 65171dba320c805ef5be92765c981acb93b93095e756f674e465ccfd2cdc2c48 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 16 Oct 2013 12:30:46 +0000 Subject: [PATCH] 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 --- glibc-testsuite.changes | 5 +++++ glibc-testsuite.spec | 13 ++++++++----- glibc-utils.changes | 5 +++++ glibc-utils.spec | 13 ++++++++----- glibc.changes | 5 +++++ glibc.spec | 13 ++++++++----- 6 files changed, 39 insertions(+), 15 deletions(-) diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index d0ab3b5..16e45fb 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -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 diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index e948650..2040362 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -78,11 +78,11 @@ BuildRequires: gd-devel %ifarch ppc ppc64 %define optimize_power 1 %ifarch ppc - %define powerpc_optimize_base power3 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_tune power3 %define powerpc_optimize_cpu_power4 %{normal_build} %else - %define powerpc_optimize_base power4 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_tune power5 %define powerpc_optimize_cpu_power4 0 %endif @@ -92,7 +92,7 @@ BuildRequires: gd-devel %define powerpc_optimize_cpu_cell 0 %else %define optimize_power 0 - %define powerpc_optimize_base 0 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power6 0 %define powerpc_optimize_cpu_power7 0 @@ -658,8 +658,11 @@ configure_and_build_glibc() { # Build POWER-optimized glibc # # First, base build: - pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} -mtune=%{powerpc_optimize_tune}" - %if %{powerpc_optimize_base} != "power3" + pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}" + %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} %else # Use no default CPU diff --git a/glibc-utils.changes b/glibc-utils.changes index d0ab3b5..16e45fb 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -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 diff --git a/glibc-utils.spec b/glibc-utils.spec index f83982d..49a96ff 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -77,11 +77,11 @@ BuildRequires: gd-devel %ifarch ppc ppc64 %define optimize_power 1 %ifarch ppc - %define powerpc_optimize_base power3 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_tune power3 %define powerpc_optimize_cpu_power4 %{normal_build} %else - %define powerpc_optimize_base power4 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_tune power5 %define powerpc_optimize_cpu_power4 0 %endif @@ -91,7 +91,7 @@ BuildRequires: gd-devel %define powerpc_optimize_cpu_cell 0 %else %define optimize_power 0 - %define powerpc_optimize_base 0 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power6 0 %define powerpc_optimize_cpu_power7 0 @@ -658,8 +658,11 @@ configure_and_build_glibc() { # Build POWER-optimized glibc # # First, base build: - pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} -mtune=%{powerpc_optimize_tune}" - %if %{powerpc_optimize_base} != "power3" + pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}" + %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} %else # Use no default CPU diff --git a/glibc.changes b/glibc.changes index d0ab3b5..16e45fb 100644 --- a/glibc.changes +++ b/glibc.changes @@ -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 diff --git a/glibc.spec b/glibc.spec index 02db1d7..9f8cc95 100644 --- a/glibc.spec +++ b/glibc.spec @@ -78,11 +78,11 @@ BuildRequires: gd-devel %ifarch ppc ppc64 %define optimize_power 1 %ifarch ppc - %define powerpc_optimize_base power3 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_tune power3 %define powerpc_optimize_cpu_power4 %{normal_build} %else - %define powerpc_optimize_base power4 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_tune power5 %define powerpc_optimize_cpu_power4 0 %endif @@ -92,7 +92,7 @@ BuildRequires: gd-devel %define powerpc_optimize_cpu_cell 0 %else %define optimize_power 0 - %define powerpc_optimize_base 0 + %define powerpc_optimize_base %{nil} %define powerpc_optimize_cpu_power4 0 %define powerpc_optimize_cpu_power6 0 %define powerpc_optimize_cpu_power7 0 @@ -658,8 +658,11 @@ configure_and_build_glibc() { # Build POWER-optimized glibc # # First, base build: - pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} -mtune=%{powerpc_optimize_tune}" - %if %{powerpc_optimize_base} != "power3" + pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}" + %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} %else # Use no default CPU