From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7933) id 7267B3858D32; Mon, 10 Jul 2023 12:50:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7267B3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688993412; bh=z+Ci14tKQPKenPR5HGKQjvF3TraVcRrJnwawVtSrayM=; h=From:To:Subject:Date:From; b=rYGCZ4sF+BZ9vt7R+Aio5vUTGHJsVKVKhjRB/huNmSTmAL8ynogF2Li/6QfrVnYGu QKv79vz1CTxqTnzFUds4PMIQwiWc1wim9O/wtux5Gy7/vcms+6q2XQycberX4kallw Vp5thxaifnzH45+09bu+YeD9gSwNDJ8AgNoU0Zco= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Frederic Berat To: glibc-cvs@sourceware.org Subject: [glibc] sysdeps/s390: Exclude fortified routines from being built with _FORTIFY_SOURCE X-Act-Checkin: glibc X-Git-Author: =?utf-8?b?RnLDqWTDqXJpYyBCw6lyYXQ=?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 7ff33eca6860648fb909df954da4996ce853d01d X-Git-Newrev: e30048fdc1878a65d9a1a13305d74b8de542bae9 Message-Id: <20230710125012.7267B3858D32@sourceware.org> Date: Mon, 10 Jul 2023 12:50:12 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e30048fdc1878a65d9a1a13305d74b8de542bae9 commit e30048fdc1878a65d9a1a13305d74b8de542bae9 Author: Frédéric Bérat Date: Fri Jul 7 16:20:48 2023 +0200 sysdeps/s390: Exclude fortified routines from being built with _FORTIFY_SOURCE Depending on build configuration, the [routine]-c.c files may be chosen to provide fortified routines implementation. While [routines].c implementation were automatically excluded, the [routines]-c.c ones were not. This patch fixes that by adding these file to the list to be filtered. Diff: --- sysdeps/s390/Makefile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 1d687a2184..b793b26112 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -94,6 +94,15 @@ sysdep_routines += memset memset-z900 \ rawmemchr rawmemchr-vx rawmemchr-c \ memccpy memccpy-vx memccpy-c \ memrchr memrchr-vx memrchr-c + +# Exclude fortified routines from being built with _FORTIFY_SOURCE +routines_no_fortify += \ + memmove-c \ + stpcpy-c \ + stpncpy-c \ + strcat-c \ + strncat-c \ + # routines_no_fortify endif ifeq ($(subdir),wcsmbs) @@ -116,4 +125,15 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \ wmemchr wmemchr-vx wmemchr-c \ wmemset wmemset-vx wmemset-c \ wmemcmp wmemcmp-vx wmemcmp-c + +# Exclude fortified routines from being built with _FORTIFY_SOURCE +routines_no_fortify += \ + wcpcpy-c \ + wcpncpy-c \ + wcscat-c \ + wcscpy-c \ + wcsncat-c \ + wcsncpy-c \ + wmemset-c \ + # routines_no_fortify endif