diff --git a/glibc-fedora-strict-aliasing.patch b/glibc-fedora-strict-aliasing.patch index e9a0f30..538c4e9 100644 --- a/glibc-fedora-strict-aliasing.patch +++ b/glibc-fedora-strict-aliasing.patch @@ -1,3 +1,4 @@ +[ Several unnecessary hunks from this patch have been removed. ] From 96aefb90e843648812d1832789f4a88ea5350605 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 25 May 2010 15:09:20 +0200 @@ -12,17 +13,6 @@ Subject: [PATCH] Avoid strict-aliasing issues sunrpc/Makefile | 4 ++++ sysdeps/powerpc/powerpc64/elf/Makefile | 2 ++ 7 files changed, 13 insertions(+), 0 deletions(-) -diff -Nrup a/elf/Makefile b/elf/Makefile ---- a/elf/Makefile 2012-08-29 07:45:37.000000000 -0600 -+++ b/elf/Makefile 2012-08-30 09:42:41.980592920 -0600 -@@ -50,6 +50,7 @@ include ../Makeconfig - ifeq ($(unwind-find-fde),yes) - routines += unwind-dw2-fde-glibc - shared-only-routines += unwind-dw2-fde-glibc -+CFLAGS-unwind-dw2-fde-glibc.c += -fno-strict-aliasing - endif - - before-compile = $(objpfx)trusted-dirs.h diff -Nrup a/inet/Makefile b/inet/Makefile --- a/inet/Makefile 2012-08-29 07:45:37.000000000 -0600 +++ b/inet/Makefile 2012-08-30 09:42:41.981592916 -0600 @@ -35,54 +25,6 @@ diff -Nrup a/inet/Makefile b/inet/Makefile ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -fexceptions -diff -Nrup a/nis/Makefile b/nis/Makefile ---- a/nis/Makefile 2012-08-29 07:45:37.000000000 -0600 -+++ b/nis/Makefile 2012-08-30 09:42:41.982592912 -0600 -@@ -71,6 +71,8 @@ libnss_nisplus-inhibit-o = $(filter-out - - include ../Rules - -+CFLAGS-nis_findserv.c += -fno-strict-aliasing -+CFLAGS-ypclnt.c += -fno-strict-aliasing - - $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) - $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ -diff -Nrup a/nss/Makefile b/nss/Makefile ---- a/nss/Makefile 2012-08-29 07:45:37.000000000 -0600 -+++ b/nss/Makefile 2012-08-30 09:42:42.021592753 -0600 -@@ -101,6 +101,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf - echo '#include "$<"') > $@.new - mv -f $@.new $@ - -+CFLAGS-files-hosts.c += -fno-strict-aliasing - - $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o) - -diff -Nrup a/resolv/Makefile b/resolv/Makefile ---- a/resolv/Makefile 2012-08-29 07:45:37.000000000 -0600 -+++ b/resolv/Makefile 2012-08-30 09:42:42.023592745 -0600 -@@ -80,6 +80,7 @@ ifeq (yes,$(have-ssp)) - CFLAGS-libresolv += -fstack-protector - endif - CFLAGS-res_hconf.c = -fexceptions -+CFLAGS-res_send.c += -fno-strict-aliasing - - # The BIND code elicits some harmless warnings. - +cflags += -Wno-strict-prototypes -Wno-write-strings -diff -Nrup a/sunrpc/Makefile b/sunrpc/Makefile ---- a/sunrpc/Makefile 2012-08-29 07:45:37.000000000 -0600 -+++ b/sunrpc/Makefile 2012-08-30 09:42:42.024592741 -0600 -@@ -150,6 +150,10 @@ sunrpc-CPPFLAGS = -D_RPC_THREAD_SAFE_ - CPPFLAGS += $(sunrpc-CPPFLAGS) - BUILD_CPPFLAGS += $(sunrpc-CPPFLAGS) - -+CFLAGS-clnt_tcp.c += -fno-strict-aliasing -+CFLAGS-clnt_udp.c += -fno-strict-aliasing -+CFLAGS-clnt_unix.c += -fno-strict-aliasing -+ - $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so - $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so - $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile --- a/sysdeps/powerpc/powerpc64/Makefile 2012-08-30 09:42:17.872692135 -0600 +++ b/sysdeps/powerpc/powerpc64/Makefile 2012-08-30 09:42:42.024592741 -0600 diff --git a/glibc.spec b/glibc.spec index a141d6f..5777bc0 100644 --- a/glibc.spec +++ b/glibc.spec @@ -27,7 +27,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 33%{?dist} +Release: 34%{?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 @@ -1223,6 +1223,10 @@ rm -f *.filelist* %endif %changelog +* Thu Nov 29 2012 Jeff Law - 2.16.90-34 + - Remove hunks from strict-aliasing patch that are no longer + needed. + * Thu Nov 29 2012 Jeff Law - 2.16.90-33 - Resync with master. - Drop local patch for 788989.