From e30048fdc1878a65d9a1a13305d74b8de542bae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
Date: Fri, 7 Jul 2023 16:20:48 +0200
Subject: [PATCH] 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.
---
 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