From patchwork Wed Dec 18 19:07:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 36948 Received: (qmail 66798 invoked by alias); 18 Dec 2019 19:07:11 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 66773 invoked by uid 89); 18 Dec 2019 19:07:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qk1-f202.google.com Received: from mail-qk1-f202.google.com (HELO mail-qk1-f202.google.com) (209.85.222.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 18 Dec 2019 19:07:10 +0000 Received: by mail-qk1-f202.google.com with SMTP id l7so2000928qke.8 for ; Wed, 18 Dec 2019 11:07:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=nNllV8YYtk6yT1EhMvBD1ihCmWh5z4UNfTQ0Z2H0ess=; b=k5X0PC8Fw1g1KnCAD+Dpht9DrepuNzGNXF2TrOwQIdHT3Aeup3ESJq58yqoOaxiDT0 rlqvBi5w6To1HbVReg0ehRbcreZj20WqymKx3Y2ddctjo79xI8JKfpaUL1T9epfsVZTo +vxAEIPu/n2o/baPXez5viLQGV6IVwGw4J69QtniDA3XAhWylr+N3XYwgELR+0ijoM3O efBmWBnMl5qHCcISNamWcWxa9mwe4mfcdhcB9Od4iBPo354QOf/ANUBPRzy3aDWwO+b2 yhDtbSdanUC7vQej5yoyQ9MHWMIkX/rQByvLkRpGPBThdMDk4U/qm7Y/K2rDhpF7xoBD p1bg== Date: Wed, 18 Dec 2019 13:07:05 -0600 In-Reply-To: Message-Id: <20191218190705.161582-1-cbiesinger@google.com> Mime-Version: 1.0 References: Subject: [PATCH v2] Don't define _FORTIFY_SOURCE on mingw X-Patchwork-Original-From: "Christian Biesinger via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Christian Biesinger To: gdb-patches@sourceware.org Cc: Christian Biesinger X-IsSubscribed: yes Recent mingw versions require -lssp when using _FORTIFY_SOURCE, which gdb does (in common-defs.h) https://github.com/msys2/MINGW-packages/issues/5868#issuecomment-544107564 To avoid all the complications with checking for -lssp and making sure it's linked statically, just don't define it. gdb/ChangeLog: 2019-12-18 Christian Biesinger * gdbsupport/common-defs.h: Don't define _FORTIFY_SOURCE on mingw. Change-Id: Ide6870ab57198219a2ef78bc675768a789ca2b1d --- gdb/gdbsupport/common-defs.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/gdbsupport/common-defs.h b/gdb/gdbsupport/common-defs.h index 203bd8972d..53ce3c96ea 100644 --- a/gdb/gdbsupport/common-defs.h +++ b/gdb/gdbsupport/common-defs.h @@ -66,9 +66,13 @@ plus this seems like a reasonable safety measure. The check for optimization is required because _FORTIFY_SOURCE only works when optimization is enabled. If _FORTIFY_SOURCE is already defined, - then we don't do anything. */ + then we don't do anything. Also, on mingw, fortify requires + linking to -lssp, and to avoid the hassle of checking for + that and linking to it statically, we just don't define + _FORTIFY_SOURCE there. */ -#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 +#if (!defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 \ + && !defined(__MINGW32__)) #define _FORTIFY_SOURCE 2 #endif