From patchwork Fri Jul 7 14:54:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Berat X-Patchwork-Id: 1804963 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=WAzGJWTq; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QyGf25Fh0z20WT for ; Sat, 8 Jul 2023 00:55:06 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8F453385AF81 for ; Fri, 7 Jul 2023 14:55:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F453385AF81 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688741704; bh=JTeb9YsAUPlskitQOKj6Eg/kVwtqQrxZkod+lAsAXTw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=WAzGJWTqxFBq6Gkh0sVtEGWZQZEf2sRQkUOpEyBXUHMvfkk64Z4WaOkyzcj5z5vSW u3PwNI2tzmzo2b5/+sUOjmPM1dxgT/CAKGpg4LvBZbawtIi0t1/GzdaYlTKIfmtBgG xXWsAaaZrGF4DxoI0tI+obTgHlqvdYlTGeF5uHJE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5C6D23858C60 for ; Fri, 7 Jul 2023 14:54:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5C6D23858C60 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-MjC1J0imPMGv958De8pjUA-1; Fri, 07 Jul 2023 10:54:46 -0400 X-MC-Unique: MjC1J0imPMGv958De8pjUA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 978F58022EF; Fri, 7 Jul 2023 14:54:45 +0000 (UTC) Received: from Nymeria-redhat.redhat.com (unknown [10.42.28.234]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC59C492C13; Fri, 7 Jul 2023 14:54:44 +0000 (UTC) To: libc-alpha@sourceware.org, Andreas Schwab , Stefan Liebler Cc: siddhesh@gotplt.org, fberat@redhat.com Subject: [PATCH] sysdeps/s390: Exclude fortified routines from being built with _FORTIFY_SOURCE Date: Fri, 7 Jul 2023 16:54:25 +0200 Message-ID: <20230707145425.535014-1-fberat@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_B=C3=A9rat_via_Libc-alpha?= From: Frederic Berat Reply-To: =?utf-8?b?RnLDqWTDqXJpYyBCw6lyYXQ=?= Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" 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. --- 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