From e8d7e41a9d49abc4c1768403c56a19f3f19c5ac6 Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Sun, 19 Sep 2021 19:46:59 +0100 Subject: [PATCH] local-revert-bz13979 Revert: X-Git-Tag: glibc-2.16-tps~448 X-Git-Url: http://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=05c2c9618f583ea4acd69b3fe5ae2a2922dd2ddc Warn if user requests __FORTIFY_SOURCE but it is disabled [BZ #13979] * include/features.h: Warn if user requests __FORTIFY_SOURCE checking but the checks are disabled for any reason. Gbp-Pq: Topic any Gbp-Pq: Name local-revert-bz13979.diff --- include/features.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/include/features.h b/include/features.h index f3e62d336..ee9f67c2a 100644 --- a/include/features.h +++ b/include/features.h @@ -392,18 +392,14 @@ # define __USE_GNU 1 #endif -#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 -# if !defined __OPTIMIZE__ || __OPTIMIZE__ <= 0 -# warning _FORTIFY_SOURCE requires compiling with optimization (-O) -# elif !__GNUC_PREREQ (4, 1) -# warning _FORTIFY_SOURCE requires GCC 4.1 or later -# elif _FORTIFY_SOURCE > 1 +#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ + && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 +# if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 # endif -#endif -#ifndef __USE_FORTIFY_LEVEL +#else # define __USE_FORTIFY_LEVEL 0 #endif -- 2.30.2