From 380ec16d62f459d5a28cfc25b7b20990c45e1cc9 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Thu, 24 Nov 2016 12:10:13 +0100 Subject: [PATCH] x86_64: fix static build of __memcpy_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 __memcpy_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 memmove_chk. Changelog: * sysdeps/x86_64/memcpy_chk.S (__memcpy_chk): Check for SHARED instead of PIC. --- ChangeLog | 5 +++++ sysdeps/x86_64/memcpy_chk.S | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b6fc831959..bef755789a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-24 Aurelien Jarno + + * sysdeps/x86_64/memcpy_chk.S (__memcpy_chk): Check for SHARED + instead of PIC. + 2016-11-23 Joseph Myers [BZ #20859] diff --git a/sysdeps/x86_64/memcpy_chk.S b/sysdeps/x86_64/memcpy_chk.S index 2296b55119..a95b3ad3cf 100644 --- a/sysdeps/x86_64/memcpy_chk.S +++ b/sysdeps/x86_64/memcpy_chk.S @@ -19,7 +19,7 @@ #include #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 memcpy bringing in __chk_fail and all routines -- 2.43.5