This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch release/2.25/master updated. glibc-2.25-6-g0889003


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, release/2.25/master has been updated
       via  0889003c67f9c2f520a37281c4b5c3b8a9861f46 (commit)
      from  8b3caa41b9cb82651e72a0c87aa56719c134000e (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0889003c67f9c2f520a37281c4b5c3b8a9861f46

commit 0889003c67f9c2f520a37281c4b5c3b8a9861f46
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sun Mar 12 15:12:21 2017 -0700

    x86_64: fix static build of __mempcpy_chk for compilers defaulting to PIC/PIE
    
    When glibc is compiled with gcc 6.2 that has been configured with
    to default to PIC/PIE, the static version of __mempcpy_chk is not built,
    as the test is done on PIC instead of SHARED.  Fix the test to check for
    SHARED, like it is done for similar functions like __memcpy_chk.
    
    2017-03-12  Mike Frysinger  <vapier@gentoo.org>
    
    	* sysdeps/x86_64/mempcpy_chk.S (__mempcpy_chk): Check for SHARED
    	instead of PIC.
    
    (cherry picked from commit fbe355fbd1973d6e29561084b3eaeb4bfe9d515a)

diff --git a/ChangeLog b/ChangeLog
index d8ed2e4..c29a70a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-15  Mike Frysinger  <vapier@gentoo.org>
+
+	* sysdeps/x86_64/mempcpy_chk.S (__mempcpy_chk): Check for SHARED
+	instead of PIC.
+
 2017-03-15  John David Anglin  <danglin@gcc.gnu.org>
 
 	* sysdeps/hppa/dl-machine.h (DL_STACK_END): Define.
diff --git a/sysdeps/x86_64/mempcpy_chk.S b/sysdeps/x86_64/mempcpy_chk.S
index f8a9260..f912291 100644
--- a/sysdeps/x86_64/mempcpy_chk.S
+++ b/sysdeps/x86_64/mempcpy_chk.S
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #include "asm-syntax.h"
 
-#ifndef PIC
+#ifndef SHARED
 	/* For libc.so this is defined in memcpy.S.
 	   For libc.a, this is a separate source to avoid
 	   mempcpy bringing in __chk_fail and all routines

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |    5 +++++
 sysdeps/x86_64/mempcpy_chk.S |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]