From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7919) id 316BF3858D28; Tue, 11 Apr 2023 02:37:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 316BF3858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681180628; bh=UrmXMci1iuR5U4meciydLTx/dcEPnB9UUEhUeXo8lcs=; h=From:To:Subject:Date:From; b=qVp9zbbVkt9+dTYAIcqaVMhZ/0p/9b3qxfsiHbfpDyikTPrCr/dQ4jaGD04GXabr3 ++YUR3whyNvHqNN/nlt0NZoFulGcpsI7+SD17XBKUrp+B7buwIMIgGe7bDuMyFyzmm K8rLGXQV1wdlIgrZ+xbLev1EtEVKQHC4m62frDQk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sam James To: glibc-cvs@sourceware.org Subject: [glibc/release/2.37/master] stdio-common: tests: don't double-define _FORTIFY_SOURCE X-Act-Checkin: glibc X-Git-Author: Sam James X-Git-Refname: refs/heads/release/2.37/master X-Git-Oldrev: 590d0e089b06f158ded713f5e5600eaa66dcea44 X-Git-Newrev: 1d63573f81945a489ea169636fa11850bc74716b Message-Id: <20230411023708.316BF3858D28@sourceware.org> Date: Tue, 11 Apr 2023 02:37:08 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1d63573f81945a489ea169636fa11850bc74716b commit 1d63573f81945a489ea169636fa11850bc74716b Author: Sam James Date: Tue Feb 21 09:27:26 2023 +0000 stdio-common: tests: don't double-define _FORTIFY_SOURCE Exactly the same as 35bcb08eaa953c9b8bef6ab2486dc4361e1f26c0. If using -D_FORITFY_SOURCE=3 (in my case, I've patched GCC to add =3 instead of =2 (we've done =2 for years in Gentoo)), building glibc tests will fail on tst-bz11319-fortify2 like: ``` : error: "_FORTIFY_SOURCE" redefined [-Werror] : note: this is the location of the previous definition cc1: all warnings being treated as errors ``` It's just because we're always setting -D_FORTIFY_SOURCE=2 rather than unsetting it first. If F_S is already 2, it's harmless, but if it's another value (say, 1, or 3), the compiler will bawk. (I'm not aware of a reason this couldn't be tested with =3, but the toolchain support is limited for that (too new), and we want to run the tests everywhere possible.) As Siddhesh noted previously, we could implement some fallback logic to determine the maximal F_S value supported by the toolchain, which is a bit easier now that autoconf-archive has been updated for F_S=3 (https://github.com/autoconf-archive/autoconf-archive/pull/269), but let's revisit this if it continues to crop up. Signed-off-by: Sam James Reviewed-by: Siddhesh Poyarekar (cherry picked from commit ecf8ae6704d5034fc2d5e29e5dc88dbca981581e) Diff: --- stdio-common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 652d9e5f95..fdc49f32ea 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -433,7 +433,7 @@ CFLAGS-tst-gets.c += -Wno-deprecated-declarations # BZ #11319 was first fixed for regular vdprintf, then reopened because # the fortified version had the same bug. -CFLAGS-tst-bz11319-fortify2.c += -D_FORTIFY_SOURCE=2 +CFLAGS-tst-bz11319-fortify2.c += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 CFLAGS-tst-memstream-string.c += -fno-builtin-fprintf