From 360c4a1c7828ba88bfbb757a3b25e29164e78c2d Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 3 Feb 2012 09:30:02 -0700 Subject: [PATCH] - Turn off -mno-minimal-toc on PPC (#787201) - Remove hunk from glibc-rh657588.patch that didn't belong --- glibc-rh657588.patch | 12 ------------ glibc-rh787201.patch | 12 ++++++++++++ glibc.spec | 8 +++++++- 3 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 glibc-rh787201.patch diff --git a/glibc-rh657588.patch b/glibc-rh657588.patch index f5895a3..80ba5e8 100644 --- a/glibc-rh657588.patch +++ b/glibc-rh657588.patch @@ -1,15 +1,3 @@ -diff -rup a/localedata/locales/pt_PT b/localedata/locales/pt_PT ---- a/localedata/locales/pt_PT 2006-07-30 16:19:43.000000000 -0600 -+++ b/localedata/locales/pt_PT 2012-01-30 20:54:30.530231851 -0700 -@@ -65,7 +65,7 @@ END LC_MESSAGES - LC_MONETARY - int_curr_symbol "" - currency_symbol "" --mon_decimal_point "" -+mon_decimal_point "" - mon_thousands_sep "" - mon_grouping 3;3 - positive_sign "" diff -rup a/localedata/locales/zh_CN b/localedata/locales/zh_CN --- a/localedata/locales/zh_CN 2006-07-30 16:19:43.000000000 -0600 +++ b/localedata/locales/zh_CN 2012-01-30 21:24:46.905115483 -0700 diff --git a/glibc-rh787201.patch b/glibc-rh787201.patch new file mode 100644 index 0000000..cd7cfe1 --- /dev/null +++ b/glibc-rh787201.patch @@ -0,0 +1,12 @@ +diff -rup a/fedora/glibc.spec.in b/fedora/glibc.spec.in +--- a/fedora/glibc.spec.in 2011-10-19 05:04:41.000000000 -0600 ++++ b/fedora/glibc.spec.in 2012-02-03 09:26:36.669828253 -0700 +@@ -316,7 +316,7 @@ GCC="gcc -m64" + GXX="g++ -m64" + %endif + %ifarch ppc64 +-BuildFlags="-mno-minimal-toc" ++BuildFlags= + GCC="gcc -m64" + GXX="g++ -m64" + %endif diff --git a/glibc.spec b/glibc.spec index 155cc7b..e85d752 100644 --- a/glibc.spec +++ b/glibc.spec @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 8%{?dist} +Release: 9%{?dist} # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -69,6 +69,7 @@ Patch16: %{name}-sw13618-2.patch Patch17: %{name}-rh783979.patch # Needs to go upstream Patch18: %{name}-rh657588.patch +Patch19: %{name}-rh787201.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 @@ -305,6 +306,7 @@ rm -rf %{glibcportsdir} %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -1157,6 +1159,10 @@ rm -f *.filelist* %endif %changelog +* Fri Feb 3 2012 Jeff Law - 2.15-9 + - Turn off -mno-minimal-toc on PPC (#787201) + - Remove hunk from glibc-rh657588.patch that didn't belong + * Wed Feb 1 2012 Jeff Law - 2.15-8 - Prevent erroneous inline optimization of initfini.s on PowerPC64 (#783979) - Use upstream variant of fix for 740506.