From: Mike Frysinger Date: Sun, 12 Mar 2017 22:12:21 +0000 (-0700) Subject: x86_64: fix static build of __mempcpy_chk for compilers defaulting to PIC/PIE X-Git-Tag: upstream/2.30~3642 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbe355fbd1973d6e29561084b3eaeb4bfe9d515a;p=platform%2Fupstream%2Fglibc.git 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 * sysdeps/x86_64/mempcpy_chk.S (__mempcpy_chk): Check for SHARED instead of PIC. --- diff --git a/ChangeLog b/ChangeLog index f1f9ceb..d930009d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-15 Mike Frysinger + + * sysdeps/x86_64/mempcpy_chk.S (__mempcpy_chk): Check for SHARED + instead of PIC. + 2017-03-15 Joseph Myers [BZ #21094] 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 #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