From dad3b40fadef113fe30e3710129019c3f84a77caed27b8e93f36a5ed7a01cb56 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 3 Mar 2009 17:34:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=2 --- glibc-2.9-fortify.diff | 16 ++++++++++++++++ glibc.changes | 6 ++++++ glibc.spec | 7 ++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 glibc-2.9-fortify.diff diff --git a/glibc-2.9-fortify.diff b/glibc-2.9-fortify.diff new file mode 100644 index 0000000..7dc6f0b --- /dev/null +++ b/glibc-2.9-fortify.diff @@ -0,0 +1,16 @@ +--- misc/sys/cdefs.h.orig 2009-02-27 16:05:10.000000000 +0100 ++++ misc/sys/cdefs.h 2009-02-27 16:06:32.000000000 +0100 +@@ -303,7 +303,12 @@ + # endif + # else + # define __extern_inline extern __inline +-# define __extern_always_inline extern __always_inline ++# if __GNUC_PREREQ (4,3) ++# define __extern_always_inline \ ++ extern __always_inline __attribute__ ((__artificial__)) ++# else ++# define __extern_always_inline extern __always_inline ++# endif + # endif + #endif + diff --git a/glibc.changes b/glibc.changes index a80652d..39b09c2 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 27 16:21:17 CET 2009 - rguenther@suse.de + +- Make sure to mark fortified inline routines with + __attribute__((__artificial__)). + ------------------------------------------------------------------- Wed Feb 18 16:18:19 CET 2009 - adrian@suse.de diff --git a/glibc.spec b/glibc.spec index 39d8d14..96cf84e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -69,7 +69,7 @@ Obsoletes: glibc-32bit Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.9 -Release: 12 +Release: 14 %define snapshot_date 2008111711 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem @@ -149,6 +149,7 @@ Patch54: glibc-2.10-nscd-nostack.diff Patch55: glibc-cpusetsize.diff Patch56: glibc-ldscript.diff Patch57: glibc-mtfsf.diff +Patch58: glibc-2.9-fortify.diff %description The GNU C Library provides the most important standard libraries used @@ -358,6 +359,7 @@ rm sysdeps/x86_64/fpu/s_sincos.S %patch55 %patch56 %patch57 +%patch58 %patch5 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! @@ -1056,6 +1058,9 @@ exit 0 %{_libdir}/libdl_p.a %changelog +* Fri Feb 27 2009 rguenther@suse.de +- Make sure to mark fortified inline routines with + __attribute__((__artificial__)). * Wed Feb 18 2009 adrian@suse.de - Build i686 glibc src rpm as nosrc to get both versions on the media [bnc#474338]