From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 112339 invoked by alias); 5 Dec 2019 16:19:28 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 112282 invoked by uid 9299); 5 Dec 2019 16:19:28 -0000 Date: Thu, 05 Dec 2019 16:19:00 -0000 Message-ID: <20191205161928.112280.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.28/master] : Define __CORRECT_ISO_CPP_STRING_H_PROTO for Clang [BZ #25232] X-Act-Checkin: glibc X-Git-Author: Kamlesh Kumar X-Git-Refname: refs/heads/release/2.28/master X-Git-Oldrev: 9f917f7b411c307c34eb1bae85d72ffe26167523 X-Git-Newrev: ef0051070f820dd5c83a73c0f069cfc4fb373db8 X-SW-Source: 2019-q4/txt/msg00541.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ef0051070f820dd5c83a73c0f069cfc4fb373db8 commit ef0051070f820dd5c83a73c0f069cfc4fb373db8 Author: Kamlesh Kumar Date: Thu Dec 5 16:56:04 2019 +0100 : Define __CORRECT_ISO_CPP_STRING_H_PROTO for Clang [BZ #25232] Without the asm redirects, strchr et al. are not const-correct. libc++ has a wrapper header that works with and without __CORRECT_ISO_CPP_STRING_H_PROTO (using a Clang extension). But when Clang is used with libstdc++ or just C headers, the overloaded functions with the correct types are not declared. This change does not impact current GCC (with libstdc++ or libc++). (cherry picked from commit 953ceff17a4a15b10cfdd5edc3c8cae4884c8ec3) Diff: --- NEWS | 1 + string/string.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d488f14..ace1b86 100644 --- a/NEWS +++ b/NEWS @@ -72,6 +72,7 @@ The following bugs are resolved with this release: [25203] libio: Disable vtable validation for pre-2.1 interposed handles [25204] Ignore LD_PREFER_MAP_32BIT_EXEC for SUID programs [25225] ld.so fails to link on x86 if GCC defaults to -fcf-protection + [25232] No const correctness for strchr et al. for Clang++ Security related changes: diff --git a/string/string.h b/string/string.h index 150cfd8..22cd0fa 100644 --- a/string/string.h +++ b/string/string.h @@ -33,7 +33,8 @@ __BEGIN_DECLS #include /* Tell the caller that we provide correct C++ prototypes. */ -#if defined __cplusplus && __GNUC_PREREQ (4, 4) +#if defined __cplusplus && (__GNUC_PREREQ (4, 4) \ + || __glibc_clang_prereq (3, 5)) # define __CORRECT_ISO_CPP_STRING_H_PROTO #endif