[src/trunk]: src/sys/arch/i386 Replace a constant in ldscript.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e05bae5c704
branches:  trunk
changeset: 340177:5e05bae5c704
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Tue Aug 25 12:56:58 2015 +0000

description:
Replace a constant in ldscript.

diffstat:

 sys/arch/i386/conf/kern.ldscript     |  10 ++++++----
 sys/arch/i386/conf/kern.ldscript.4MB |  10 ++++++----
 sys/arch/i386/conf/kern.ldscript.Xen |  10 ++++++----
 sys/arch/i386/i386/genassym.cf       |   3 ++-
 4 files changed, 20 insertions(+), 13 deletions(-)

diffs (110 lines):

diff -r 741e60d95d56 -r 5e05bae5c704 sys/arch/i386/conf/kern.ldscript
--- a/sys/arch/i386/conf/kern.ldscript  Tue Aug 25 12:55:30 2015 +0000
+++ b/sys/arch/i386/conf/kern.ldscript  Tue Aug 25 12:56:58 2015 +0000
@@ -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 @@
   {
     *(.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 = . ;
diff -r 741e60d95d56 -r 5e05bae5c704 sys/arch/i386/conf/kern.ldscript.4MB
--- a/sys/arch/i386/conf/kern.ldscript.4MB      Tue Aug 25 12:55:30 2015 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.4MB      Tue Aug 25 12:56:58 2015 +0000
@@ -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 @@
   {
     *(.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 = . ;
diff -r 741e60d95d56 -r 5e05bae5c704 sys/arch/i386/conf/kern.ldscript.Xen
--- a/sys/arch/i386/conf/kern.ldscript.Xen      Tue Aug 25 12:55:30 2015 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.Xen      Tue Aug 25 12:56:58 2015 +0000
@@ -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 @@
   {
     *(.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 = . ;
diff -r 741e60d95d56 -r 5e05bae5c704 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Tue Aug 25 12:55:30 2015 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Tue Aug 25 12:56:58 2015 +0000
@@ -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 SCHEDOP_yield           SCHEDOP_yield
 endif
 
+define COHERENCY_UNIT          COHERENCY_UNIT