From owner-svn-src-all@freebsd.org Wed Nov 13 04:04:16 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9532717CB21; Wed, 13 Nov 2019 04:04:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47CWFr3Phzz4Vxk; Wed, 13 Nov 2019 04:04:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from [192.168.0.2] (unknown [181.52.72.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: pfg) by smtp.freebsd.org (Postfix) with ESMTPSA id DA2B3F648; Wed, 13 Nov 2019 04:04:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Subject: Re: svn commit: r354672 - head/lib/libc/secure To: Kyle Evans , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201911130300.xAD30WUE099996@repo.freebsd.org> From: Pedro Giffuni Organization: FreeBSD Message-ID: <80479651-f60d-e352-1f40-f01939aff9fd@FreeBSD.org> Date: Tue, 12 Nov 2019 23:04:14 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 MIME-Version: 1.0 In-Reply-To: <201911130300.xAD30WUE099996@repo.freebsd.org> Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2019 04:04:16 -0000 On 12/11/2019 22:00, Kyle Evans wrote: > Author: kevans > Date: Wed Nov 13 03:00:32 2019 > New Revision: 354672 > URL: https://svnweb.freebsd.org/changeset/base/354672 > > Log: > ssp: rework the logic to use priority=200 on clang builds > > The preproc logic was added at the last minute to appease GCC 4.2, and > kevans@ did clearly not go back and double-check that the logic worked out > for clang builds to use the new variant. > > It turns out that clang defines __GNUC__ == 4. Flip it around and check > __clang__ as well, leaving a note to remove it later. > clang reports itself as GCC 4.2, the priority argument was introduced in GCC 4.3. > Reported by: cem > > Modified: > head/lib/libc/secure/stack_protector.c > > Modified: head/lib/libc/secure/stack_protector.c > ============================================================================== > --- head/lib/libc/secure/stack_protector.c Wed Nov 13 02:22:00 2019 (r354671) > +++ head/lib/libc/secure/stack_protector.c Wed Nov 13 03:00:32 2019 (r354672) > @@ -47,13 +47,15 @@ __FBSDID("$FreeBSD$"); > * they're either not usually statically linked or they simply don't do things > * in constructors that would be adversely affected by their positioning with > * respect to this initialization. > + * > + * This conditional should be removed when GCC 4.2 is removed. > */ > -#if defined(__GNUC__) && __GNUC__ <= 4 > -#define _GUARD_SETUP_CTOR_ATTR \ > - __attribute__((__constructor__, __used__)); > -#else > +#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ > 4) > #define _GUARD_SETUP_CTOR_ATTR \ > __attribute__((__constructor__ (200), __used__)); > +#else > +#define _GUARD_SETUP_CTOR_ATTR \ > + __attribute__((__constructor__, __used__)); > #endif > > extern int __sysctl(const int *name, u_int namelen, void *oldp, Please fix properly. Assuming clang always supported it, something like: #if __GNUC_PREREQ__(4, 3) || __has_attribute(__constructor__) should work Cheers, Pedro.