Author: ian
Date: Sun Jan 24 22:17:05 2016
New Revision: 294690
URL: https://svnweb.freebsd.org/changeset/base/294690
Log:
MFC r289477:
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).
Modified:
stable/10/sys/arm/mv/std-pj4b.mv
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/mv/std-pj4b.mv
==============================================================================
--- stable/10/sys/arm/mv/std-pj4b.mv Sun Jan 24 22:14:37 2016
(r294689)
+++ stable/10/sys/arm/mv/std-pj4b.mv Sun Jan 24 22:17:05 2016
(r294690)
@@ -5,4 +5,8 @@ cpu CPU_MV_PJ4B
machine arm armv6
makeoptions CONF_CFLAGS="-march=armv7a -Wa,-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"
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
