This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-567-g1e4920e
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Apr 2012 20:33:50 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-567-g1e4920e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 1e4920e0808439be5e4a6a6e8a736de32c43b070 (commit)
from 5ed848f3d8b5b3be92fe3006fd18a089ef982316 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1e4920e0808439be5e4a6a6e8a736de32c43b070
commit 1e4920e0808439be5e4a6a6e8a736de32c43b070
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Feb 22 13:26:19 2011 -0500
memset: fix define usage for shared libs
The proper define to check "am I in a shared lib" is "SHARED", not "PIC".
The two new memset_chk functions incorrectly depend on "PIC".
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
diff --git a/ChangeLog b/ChangeLog
index cdecc65..bed8caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-07 Mike Frysinger <vapier@gentoo.org>
+
+ * sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED.
+ * sysdeps/x86_64/memset_chk.S: Likewise.
+
2012-04-07 David S. Miller <davem@davemloft.net>
* elf/elf.h (R_SPARC_WDISP10): Define.
diff --git a/sysdeps/i386/i686/memset_chk.S b/sysdeps/i386/i686/memset_chk.S
index 504fc06..f2e7fd7 100644
--- a/sysdeps/i386/i686/memset_chk.S
+++ b/sysdeps/i386/i686/memset_chk.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#include "asm-syntax.h"
-#ifndef PIC
+#ifndef SHARED
/* For libc.so this is defined in memset.S.
For libc.a, this is a separate source to avoid
memset bringing in __chk_fail and all routines
diff --git a/sysdeps/x86_64/memset_chk.S b/sysdeps/x86_64/memset_chk.S
index 16f1fde..9efb3d9 100644
--- a/sysdeps/x86_64/memset_chk.S
+++ b/sysdeps/x86_64/memset_chk.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#include "asm-syntax.h"
-#ifndef PIC
+#ifndef SHARED
/* For libc.so this is defined in memset.S.
For libc.a, this is a separate source to avoid
memset bringing in __chk_fail and all routines
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/i386/i686/memset_chk.S | 2 +-
sysdeps/x86_64/memset_chk.S | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources