From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 115821 invoked by alias); 31 Oct 2018 20:04:58 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 115796 invoked by uid 89); 31 Oct 2018 20:04:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=browse X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Oct 2018 20:04:54 +0000 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 941992D7E2; Wed, 31 Oct 2018 20:04:53 +0000 (UTC) Received: from localhost (unused-10-15-17-196.yyz.redhat.com [10.15.17.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63C9460851; Wed, 31 Oct 2018 20:04:53 +0000 (UTC) From: Sergio Durigan Junior To: Simon Marchi Cc: GDB Patches Subject: Re: [PATCH] Fix PR gdb/23835: Don't redefine _FORTIFY_SOURCE if it's already defined References: <20181030214236.29081-1-sergiodj@redhat.com> <7524d20b4c0390d73fcd4225924329df@polymtl.ca> Date: Wed, 31 Oct 2018 20:04:00 -0000 In-Reply-To: <7524d20b4c0390d73fcd4225924329df@polymtl.ca> (Simon Marchi's message of "Tue, 30 Oct 2018 17:53:52 -0400") Message-ID: <87zhut9922.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2018-10/txt/msg00761.txt.bz2 On Tuesday, October 30 2018, Simon Marchi wrote: > On 2018-10-30 17:42, Sergio Durigan Junior wrote: >> Gentoo has a local GCC patch which always defines _FORTIFY_SOURCE=2. >> This causes a build problem when building GDB there, because >> "common/common-defs.h" also defines _FORTIFY_SOURCE=2: >> >> CXX gdb.o >> In file included from ../../gdb/defs.h:28:0, >> from ../../gdb/gdb.c:19: >> ../../gdb/common/common-defs.h:71:0: error: "_FORTIFY_SOURCE" >> redefined [-Werror] >> #define _FORTIFY_SOURCE 2 >> >> : note: this is the location of the previous definition >> cc1plus: all warnings being treated as errors >> make[2]: *** [Makefile:1619: gdb.o] Error 1 >> >> Even though it is questionable whether Gentoo's approach is the >> correct one: >> >> https://jira.mongodb.org/browse/SERVER-29982 >> https://bugs.gentoo.org/621036 >> >> it is still possible for GDB to be a bit more robust here and make >> sure it just defines _FORTIFY_SOURCE if it hasn't been defined >> already. This patch does that. >> >> Tested by rebuilding and making sure the macro was defined. > > I think it makes sense, it also gives the user the possibility to > override it, if they don't like our value. Give it a few days to give > others a change to respond. If you don't hear anything in ~1 week, > please go ahead and push. Thanks for the review. I'll wait a week. >> gdb/ChangeLog: >> 2018-10-30 Sergio Durigan Junior >> >> PR gdb/23835 >> * common/common-defs.h: Don't redefine _FORTIFY_SOURCE is it's >> already defined. >> --- >> gdb/ChangeLog | 6 ++++++ >> gdb/common/common-defs.h | 5 +++-- >> 2 files changed, 9 insertions(+), 2 deletions(-) >> >> diff --git a/gdb/ChangeLog b/gdb/ChangeLog >> index 940300f95a..239d7e16c2 100644 >> --- a/gdb/ChangeLog >> +++ b/gdb/ChangeLog >> @@ -1,3 +1,9 @@ >> +2018-10-30 Sergio Durigan Junior >> + >> + PR gdb/23835 >> + * common/common-defs.h: Don't redefine _FORTIFY_SOURCE is it's > > is -> if. Fixed. -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible http://sergiodj.net/