From owner-svn-src-head@FreeBSD.ORG Thu Jan 9 23:26:45 2014 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1FF8BFC; Thu, 9 Jan 2014 23:26:45 +0000 (UTC) Received: from mho-02-ewr.mailhop.org (mho-02-ewr.mailhop.org [204.13.248.72]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A29A71A2D; Thu, 9 Jan 2014 23:26:45 +0000 (UTC) Received: from c-24-8-230-52.hsd1.co.comcast.net ([24.8.230.52] helo=damnhippie.dyndns.org) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1W1Ozs-000BRn-6B; Thu, 09 Jan 2014 23:26:44 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id s09NQfgK032121; Thu, 9 Jan 2014 16:26:41 -0700 (MST) (envelope-from ian@FreeBSD.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 24.8.230.52 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/Tr/BwvyIKSYSfL48xN33j Subject: Re: svn commit: r260494 - head/sys/conf From: Ian Lepore To: Dimitry Andric In-Reply-To: <201401092216.s09MGUpe063050@svn.freebsd.org> References: <201401092216.s09MGUpe063050@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Thu, 09 Jan 2014 16:26:41 -0700 Message-ID: <1389310001.1158.434.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2014 23:26:45 -0000 On Thu, 2014-01-09 at 22:16 +0000, Dimitry Andric wrote: > Author: dim > Date: Thu Jan 9 22:16:30 2014 > New Revision: 260494 > URL: http://svnweb.freebsd.org/changeset/base/260494 > > Log: > Fix a braino with r259730: we cannot currently use CFLAGS.gcc or > CFLAGS.clang in sys/conf/Makefile.arm, since the main kernel build does > not use . So revert that particular change for now. > > Pointy hat to: me > Noticed by: zbb > MFC after: 3 days > X-MFC-With: r259730 > > Modified: > head/sys/conf/Makefile.arm > > Modified: head/sys/conf/Makefile.arm > ============================================================================== > --- head/sys/conf/Makefile.arm Thu Jan 9 20:57:19 2014 (r260493) > +++ head/sys/conf/Makefile.arm Thu Jan 9 22:16:30 2014 (r260494) > @@ -39,16 +39,20 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscri > STRIP_FLAGS = -S > .endif > > -CFLAGS.gcc += -mno-thumb-interwork > +.if ${COMPILER_TYPE} != "clang" > +CFLAGS += -mno-thumb-interwork > +.endif > > .if empty(DDB_ENABLED) > -.if defined(WITHOUT_ARM_EABI) > -CFLAGS.gcc += -mno-apcs-frame > +.if defined(WITHOUT_ARM_EABI) && ${COMPILER_TYPE} != "clang" > +CFLAGS += -mno-apcs-frame > .endif > .elif !defined(WITHOUT_ARM_EABI) > CFLAGS += -funwind-tables > +.if ${COMPILER_TYPE} == "clang" > # clang requires us to tell it to emit assembly with unwind information > -CFLAGS.clang += -mllvm -arm-enable-ehabi > +CFLAGS += -mllvm -arm-enable-ehabi > +.endif > .endif > > SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \ That fixed it, now we can get backtraces in DDB again. Thanks. -- Ian