forked from pool/glibc
Accepting request 241892 from home:Andreas_Schwab:Factory
- dt-ppc64-num.patch: Correct DT_PPC64_NUM (bnc#887169, BZ #17153) OBS-URL: https://build.opensuse.org/request/show/241892 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=374
This commit is contained in:
Git OBS Bridge
parent
7550c6de6a
commit
cb23041758
19
dt-ppc64-num.patch
Normal file
19
dt-ppc64-num.patch
Normal file
@ -0,0 +1,19 @@
|
||||
2014-07-14 Alan Modra <amodra@gmail.com>
|
||||
|
||||
[BZ #17153]
|
||||
* elf/elf.h (DT_PPC64_NUM): Correct value.
|
||||
* NEWS: Add to fixed bug list.
|
||||
|
||||
Index: glibc-2.19/elf/elf.h
|
||||
===================================================================
|
||||
--- glibc-2.19.orig/elf/elf.h
|
||||
+++ glibc-2.19/elf/elf.h
|
||||
@@ -2283,7 +2283,7 @@ typedef Elf32_Addr Elf32_Conflict;
|
||||
#define DT_PPC64_OPD (DT_LOPROC + 1)
|
||||
#define DT_PPC64_OPDSZ (DT_LOPROC + 2)
|
||||
#define DT_PPC64_OPT (DT_LOPROC + 3)
|
||||
-#define DT_PPC64_NUM 3
|
||||
+#define DT_PPC64_NUM 4
|
||||
|
||||
/* PowerPC64 specific values for the DT_PPC64_OPT Dyn entry. */
|
||||
#define PPC64_OPT_TLS 1
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 22 08:37:38 UTC 2014 - schwab@suse.de
|
||||
|
||||
- dt-ppc64-num.patch: Correct DT_PPC64_NUM (bnc#887169, BZ #17153)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 14 08:33:08 UTC 2014 - schwab@suse.de
|
||||
|
||||
|
||||
@ -69,6 +69,8 @@ BuildRequires: gd-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%define build_variants %{normal_build}
|
||||
|
||||
%define disable_assert 0
|
||||
%define enable_stackguard_randomization 1
|
||||
%ifarch ppc ppc64
|
||||
@ -76,7 +78,7 @@ BuildRequires: gd-devel
|
||||
%ifarch ppc
|
||||
%define powerpc_optimize_base %{nil}
|
||||
%define powerpc_optimize_tune power3
|
||||
%define powerpc_optimize_cpu_power4 %{normal_build}
|
||||
%define powerpc_optimize_cpu_power4 1
|
||||
%else
|
||||
%define powerpc_optimize_base %{nil}
|
||||
%define powerpc_optimize_tune power5
|
||||
@ -262,6 +264,8 @@ Patch1013: psfaa.patch
|
||||
Patch1014: nss-files-long-lines.patch
|
||||
# PATCH-FIX-UPSTREAM Directory traversal in locale environment handling (BZ #17137)
|
||||
Patch1015: setlocale-directory-traversal.patch
|
||||
# PATCH-FIX-UPSTREAM Correct DT_PPC64_NUM (BZ #17153)
|
||||
Patch1016: dt-ppc64-num.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -494,6 +498,7 @@ rm nscd/s-stamp
|
||||
%patch1013 -p1
|
||||
%patch1014 -p1
|
||||
%patch1015 -p1
|
||||
%patch1016 -p1
|
||||
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
@ -687,6 +692,7 @@ configure_and_build_glibc() {
|
||||
# Use no default CPU
|
||||
configure_and_build_glibc base "$pBuildFlags" "$add_ons"
|
||||
%endif
|
||||
%if %{build_variants}
|
||||
# Then other power variants:
|
||||
for pcpu in \
|
||||
%if %{powerpc_optimize_cpu_power4}
|
||||
@ -706,11 +712,14 @@ configure_and_build_glibc() {
|
||||
%if %{powerpc_optimize_cpu_cell}
|
||||
configure_and_build_glibc ppc-cell-be "$BuildFlags -mcpu=cell" "$add_ons"
|
||||
%endif
|
||||
%endif # %{build_variants}
|
||||
%endif # optimize_power
|
||||
|
||||
%if %{build_variants}
|
||||
%ifarch i686 x86_64
|
||||
configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
#
|
||||
# Build html documentation
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 22 08:37:38 UTC 2014 - schwab@suse.de
|
||||
|
||||
- dt-ppc64-num.patch: Correct DT_PPC64_NUM (bnc#887169, BZ #17153)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 14 08:33:08 UTC 2014 - schwab@suse.de
|
||||
|
||||
|
||||
@ -68,6 +68,8 @@ BuildRequires: gd-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%define build_variants %{normal_build}
|
||||
|
||||
%define disable_assert 0
|
||||
%define enable_stackguard_randomization 1
|
||||
%ifarch ppc ppc64
|
||||
@ -75,7 +77,7 @@ BuildRequires: gd-devel
|
||||
%ifarch ppc
|
||||
%define powerpc_optimize_base %{nil}
|
||||
%define powerpc_optimize_tune power3
|
||||
%define powerpc_optimize_cpu_power4 %{normal_build}
|
||||
%define powerpc_optimize_cpu_power4 1
|
||||
%else
|
||||
%define powerpc_optimize_base %{nil}
|
||||
%define powerpc_optimize_tune power5
|
||||
@ -261,6 +263,8 @@ Patch1013: psfaa.patch
|
||||
Patch1014: nss-files-long-lines.patch
|
||||
# PATCH-FIX-UPSTREAM Directory traversal in locale environment handling (BZ #17137)
|
||||
Patch1015: setlocale-directory-traversal.patch
|
||||
# PATCH-FIX-UPSTREAM Correct DT_PPC64_NUM (BZ #17153)
|
||||
Patch1016: dt-ppc64-num.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -494,6 +498,7 @@ rm nscd/s-stamp
|
||||
%patch1013 -p1
|
||||
%patch1014 -p1
|
||||
%patch1015 -p1
|
||||
%patch1016 -p1
|
||||
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
@ -687,6 +692,7 @@ configure_and_build_glibc() {
|
||||
# Use no default CPU
|
||||
configure_and_build_glibc base "$pBuildFlags" "$add_ons"
|
||||
%endif
|
||||
%if %{build_variants}
|
||||
# Then other power variants:
|
||||
for pcpu in \
|
||||
%if %{powerpc_optimize_cpu_power4}
|
||||
@ -706,11 +712,14 @@ configure_and_build_glibc() {
|
||||
%if %{powerpc_optimize_cpu_cell}
|
||||
configure_and_build_glibc ppc-cell-be "$BuildFlags -mcpu=cell" "$add_ons"
|
||||
%endif
|
||||
%endif # %{build_variants}
|
||||
%endif # optimize_power
|
||||
|
||||
%if %{build_variants}
|
||||
%ifarch i686 x86_64
|
||||
configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
#
|
||||
# Build html documentation
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 22 08:37:38 UTC 2014 - schwab@suse.de
|
||||
|
||||
- dt-ppc64-num.patch: Correct DT_PPC64_NUM (bnc#887169, BZ #17153)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 14 08:33:08 UTC 2014 - schwab@suse.de
|
||||
|
||||
|
||||
11
glibc.spec
11
glibc.spec
@ -69,6 +69,8 @@ BuildRequires: gd-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%define build_variants %{normal_build}
|
||||
|
||||
%define disable_assert 0
|
||||
%define enable_stackguard_randomization 1
|
||||
%ifarch ppc ppc64
|
||||
@ -76,7 +78,7 @@ BuildRequires: gd-devel
|
||||
%ifarch ppc
|
||||
%define powerpc_optimize_base %{nil}
|
||||
%define powerpc_optimize_tune power3
|
||||
%define powerpc_optimize_cpu_power4 %{normal_build}
|
||||
%define powerpc_optimize_cpu_power4 1
|
||||
%else
|
||||
%define powerpc_optimize_base %{nil}
|
||||
%define powerpc_optimize_tune power5
|
||||
@ -262,6 +264,8 @@ Patch1013: psfaa.patch
|
||||
Patch1014: nss-files-long-lines.patch
|
||||
# PATCH-FIX-UPSTREAM Directory traversal in locale environment handling (BZ #17137)
|
||||
Patch1015: setlocale-directory-traversal.patch
|
||||
# PATCH-FIX-UPSTREAM Correct DT_PPC64_NUM (BZ #17153)
|
||||
Patch1016: dt-ppc64-num.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -494,6 +498,7 @@ rm nscd/s-stamp
|
||||
%patch1013 -p1
|
||||
%patch1014 -p1
|
||||
%patch1015 -p1
|
||||
%patch1016 -p1
|
||||
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
@ -687,6 +692,7 @@ configure_and_build_glibc() {
|
||||
# Use no default CPU
|
||||
configure_and_build_glibc base "$pBuildFlags" "$add_ons"
|
||||
%endif
|
||||
%if %{build_variants}
|
||||
# Then other power variants:
|
||||
for pcpu in \
|
||||
%if %{powerpc_optimize_cpu_power4}
|
||||
@ -706,11 +712,14 @@ configure_and_build_glibc() {
|
||||
%if %{powerpc_optimize_cpu_cell}
|
||||
configure_and_build_glibc ppc-cell-be "$BuildFlags -mcpu=cell" "$add_ons"
|
||||
%endif
|
||||
%endif # %{build_variants}
|
||||
%endif # optimize_power
|
||||
|
||||
%if %{build_variants}
|
||||
%ifarch i686 x86_64
|
||||
configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
#
|
||||
# Build html documentation
|
||||
|
||||
Loading…
Reference in New Issue
Block a user