Module Name: src
Committed By: uebayasi
Date: Tue Aug 25 12:56:58 UTC 2015
Modified Files:
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen
src/sys/arch/i386/i386: genassym.cf
Log Message:
Replace a constant in ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/conf/kern.ldscript.Xen
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/i386/i386/genassym.cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.14 src/sys/arch/i386/conf/kern.ldscript:1.15
--- src/sys/arch/i386/conf/kern.ldscript:1.14 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript Tue Aug 25 12:56:58 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript,v 1.14 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.15 2015/08/25 12:56:58 uebayasi Exp $ */
+
+#include "assym.h"
ENTRY(_start)
SECTIONS
@@ -27,17 +29,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.15 src/sys/arch/i386/conf/kern.ldscript.4MB:1.16
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.15 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Tue Aug 25 12:56:58 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.15 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.16 2015/08/25 12:56:58 uebayasi Exp $ */
+
+#include "assym.h"
ENTRY(_start)
SECTIONS
@@ -28,17 +30,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.9 src/sys/arch/i386/conf/kern.ldscript.Xen:1.10
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.9 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Tue Aug 25 12:56:58 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.9 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.10 2015/08/25 12:56:58 uebayasi Exp $ */
+
+#include "assym.h"
SECTIONS
{
@@ -26,17 +28,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.97 src/sys/arch/i386/i386/genassym.cf:1.98
--- src/sys/arch/i386/i386/genassym.cf:1.97 Sat Feb 15 10:11:15 2014
+++ src/sys/arch/i386/i386/genassym.cf Tue Aug 25 12:56:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.97 2014/02/15 10:11:15 dsl Exp $
+# $NetBSD: genassym.cf,v 1.98 2015/08/25 12:56:58 uebayasi Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -423,3 +423,4 @@ define HYPERVISOR_sched_op __HYPERVISOR_
define SCHEDOP_yield SCHEDOP_yield
endif
+define COHERENCY_UNIT COHERENCY_UNIT
