diff --git a/glibc-strict-aliasing.diff b/glibc-strict-aliasing.diff deleted file mode 100644 index 064e0b7..0000000 --- a/glibc-strict-aliasing.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: glibc-2.15.90/elf/Makefile -=================================================================== ---- glibc-2.15.90.orig/elf/Makefile -+++ glibc-2.15.90/elf/Makefile -@@ -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 -Index: glibc-2.15.90/sunrpc/Makefile -=================================================================== ---- glibc-2.15.90.orig/sunrpc/Makefile -+++ glibc-2.15.90/sunrpc/Makefile -@@ -145,6 +145,8 @@ CFLAGS-key_call.c = -fexceptions - CFLAGS-pmap_rmt.c = -fexceptions - CFLAGS-clnt_perr.c = -fexceptions - CFLAGS-openchild.c = -fexceptions -+CFLAGS-clnt_tcp.c = -fno-strict-aliasing -+CFLAGS-clnt_unix.c = -fno-strict-aliasing - - sunrpc-CPPFLAGS = -D_RPC_THREAD_SAFE_ - CPPFLAGS += $(sunrpc-CPPFLAGS) diff --git a/glibc.changes b/glibc.changes index e825d12..0e3b1bb 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 29 14:30:11 UTC 2012 - schwab@suse.de + +- Remove obsolete patches: + glibc-strict-aliasing.diff + nscd-avoid-gcc-warning.diff + ------------------------------------------------------------------- Wed Nov 28 15:48:32 UTC 2012 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index d39c49a..c6a34d3 100644 --- a/glibc.spec +++ b/glibc.spec @@ -232,12 +232,6 @@ Patch305: glibc-nscd-hconf.diff # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 Patch306: glibc-fix-double-loopback.diff -### Misc patches -# FIX-OPENSUSE compile some files with -fno-strict-aliasing -Patch401: glibc-strict-aliasing.diff -# PATCH-FIX-OPENSUSE avoid false positive warning that triggers brp postcheck fail -Patch402: nscd-avoid-gcc-warning.diff - ### # Patches from upstream ### @@ -468,9 +462,6 @@ rm nscd/s-stamp %patch305 -p1 %patch306 -p1 -%patch401 -p1 -%patch402 -p1 - %ifarch armv7l armv7hl %patch20 -p1 %endif diff --git a/nscd-avoid-gcc-warning.diff b/nscd-avoid-gcc-warning.diff deleted file mode 100644 index 60f78f1..0000000 --- a/nscd-avoid-gcc-warning.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: glibc-2.15.90/nscd/connections.c -=================================================================== ---- glibc-2.15.90.orig/nscd/connections.c -+++ glibc-2.15.90/nscd/connections.c -@@ -1803,6 +1803,8 @@ handle_request: request received (Versio - ++nready; - } - /* NOTREACHED */ -+ assert(0); -+ return 0; - } - -