From owner-svn-src-all@freebsd.org Sun Oct 18 09:46:08 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E28D7A16330; Sun, 18 Oct 2015 09:46:08 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CABDD2; Sun, 18 Oct 2015 09:46:08 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id t9I9k2rk089809 (version=TLSv1 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sun, 18 Oct 2015 12:46:02 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua t9I9k2rk089809 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id t9I9k2Yp089802; Sun, 18 Oct 2015 12:46:02 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 18 Oct 2015 12:46:02 +0300 From: Konstantin Belousov To: Ian Lepore Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r289477 - head/sys/arm/mv Message-ID: <20151018094602.GF2257@kib.kiev.ua> References: <201510180103.t9I13h0w056671@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201510180103.t9I13h0w056671@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 18 Oct 2015 09:46:09 -0000 On Sun, Oct 18, 2015 at 01:03:43AM +0000, Ian Lepore wrote: > Author: ian > Date: Sun Oct 18 01:03:43 2015 > New Revision: 289477 > URL: https://svnweb.freebsd.org/changeset/base/289477 > > Log: > Fix a strange macro re-definition compile error. If the VM_MAXUSER_ADDRESS > value is defined as a config option the definition is emitted into > opt_global.h which is force-included into everything. In addition, the > symbol is emitted by the genassym mechanism, but that by its nature reduces > the value to a 0xnnnnnnnn number. When compiling a .S file you end up > with two different definitions of the macro (they evaluate to the same > number, but the text is different, upsetting the compiler). > > Nothing has changed about this code for a while but the compile error is > new, so this must be fallout from the clang 3.7 update or something. > > Modified: > head/sys/arm/mv/std-pj4b.mv > > Modified: head/sys/arm/mv/std-pj4b.mv > ============================================================================== > --- head/sys/arm/mv/std-pj4b.mv Sun Oct 18 00:59:28 2015 (r289476) > +++ head/sys/arm/mv/std-pj4b.mv Sun Oct 18 01:03:43 2015 (r289477) > @@ -5,4 +5,8 @@ cpu CPU_MV_PJ4B > machine arm armv6 > makeoptions CONF_CFLAGS="-march=armv7a" > > -options VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))" > +# This was originally defined as "(KERNBASE-(1024*1024*1024))" but that > +# (in opt_global.h) clashed with the value emitted by genassym which > +# reduces the original macro text to its numeric value. The only way > +# to avoid that is to define it here as the numeric value genassym emits. > +options VM_MAXUSER_ADDRESS="0x80000000" Genassym started to generate VM_MAXUSER_ADDRESS after r289372. Strange that I did not saw the error. Why does marvell need this override ?