Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Indent with 2 spaces.



details:   https://anonhg.NetBSD.org/src/rev/def8fa8c4f92
branches:  trunk
changeset: 810143:def8fa8c4f92
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Aug 20 07:00:48 2015 +0000

description:
Indent with 2 spaces.

diffstat:

 sys/arch/aarch64/conf/kern.ldscript    |   18 ++--
 sys/arch/amd64/conf/kern.ldscript.2MB  |  104 ++++++++++++++++----------------
 sys/arch/amd64/conf/kern.ldscript.Xen  |   92 ++++++++++++++--------------
 sys/arch/cats/conf/kern.ldscript       |   18 ++--
 sys/arch/cats/conf/ldscript.elf        |   18 ++--
 sys/arch/epoc32/conf/ldscript.epoc32   |   18 ++--
 sys/arch/evbarm/conf/ldscript.evbarm   |   18 ++--
 sys/arch/i386/conf/kern.ldscript       |  102 ++++++++++++++++----------------
 sys/arch/i386/conf/kern.ldscript.4MB   |  104 ++++++++++++++++----------------
 sys/arch/i386/conf/kern.ldscript.Xen   |   94 ++++++++++++++--------------
 sys/arch/i386/conf/stand.ldscript      |   90 ++++++++++++++--------------
 sys/arch/ia64/conf/kern.ldscript       |   14 ++--
 sys/arch/mips/conf/kern.ldscript       |   16 ++--
 sys/arch/mips/conf/stand.ldscript      |    6 +-
 sys/arch/mipsco/conf/stand.ldscript    |   10 +-
 sys/arch/netwinder/conf/kern.ldscript  |   18 ++--
 sys/arch/powerpc/conf/kern-mb.ldscript |    6 +-
 sys/arch/powerpc/conf/kern.ldscript    |   20 +++---
 sys/arch/powerpc/conf/kern64.ldscript  |   18 ++--
 sys/arch/riscv/conf/kern.ldscript      |   18 ++--
 sys/arch/shark/conf/kern.ldscript      |   18 ++--
 sys/arch/sparc/conf/kern.ldscript      |    8 +-
 sys/arch/sparc64/conf/kern.ldscript    |    8 +-
 sys/arch/sparc64/conf/kern32.ldscript  |    8 +-
 sys/arch/zaurus/conf/ldscript.zaurus   |   18 ++--
 25 files changed, 431 insertions(+), 431 deletions(-)

diffs (truncated from 1213 to 300 lines):

diff -r a8ebe55125b3 -r def8fa8c4f92 sys/arch/aarch64/conf/kern.ldscript
--- a/sys/arch/aarch64/conf/kern.ldscript       Thu Aug 20 06:53:11 2015 +0000
+++ b/sys/arch/aarch64/conf/kern.ldscript       Thu Aug 20 07:00:48 2015 +0000
@@ -55,15 +55,15 @@
   __bss_start__ = .;
   .bss            :
   {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
+    *(.dynbss)
+    *(.bss .bss.* .gnu.linkonce.b.*)
+    *(COMMON)
+    /* Align here to ensure that the .bss section occupies space up to
+       _end.  Align after .bss to ensure correct alignment even if the
+       .bss section disappears because there are no input sections.
+       FIXME: Why do we need it? When there is no .bss section, we don't
+       pad the .data section.  */
+    . = ALIGN(. != 0 ? 32 / 8 : 1);
   }
   _bss_end__ = . ; __bss_end__ = . ;
   . = ALIGN(32 / 8);
diff -r a8ebe55125b3 -r def8fa8c4f92 sys/arch/amd64/conf/kern.ldscript.2MB
--- a/sys/arch/amd64/conf/kern.ldscript.2MB     Thu Aug 20 06:53:11 2015 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.2MB     Thu Aug 20 07:00:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.2MB,v 1.6 2015/08/20 06:48:25 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.2MB,v 1.7 2015/08/20 07:00:48 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -6,59 +6,59 @@
 ENTRY(_start)
 SECTIONS
 {
-   /* Read-only sections, merged into text segment: */
-   .text :
-   AT (ADDR(.text))
-   {
-     *(.text)
-     *(.text.*)
-     *(.stub)
-   } =0
-   _etext = . ;
-   PROVIDE (etext = .) ;
+  /* Read-only sections, merged into text segment: */
+  .text :
+  AT (ADDR(.text))
+  {
+    *(.text)
+    *(.text.*)
+    *(.stub)
+  } =0
+  _etext = . ;
+  PROVIDE (etext = .) ;
 
-   .rodata :
-   AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
-   {
-     *(.rodata)
-     *(.rodata.*)
-   }
+  .rodata :
+  AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
+  {
+    *(.rodata)
+    *(.rodata.*)
+  }
 
-   /* Adjust the address for the data segment.  We push the data segment
-      up to the next 2MB boundary so that we can map the text with large
-      pages. */
-   . = ALIGN(0x200000);
-   __data_start = . ;
-   .data :
-   AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
-   {
-     *(.data)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
-     *(.data.cacheline_aligned)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.read_mostly :
-   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
-   {
-     *(.data.read_mostly)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   _edata = . ;
-   PROVIDE (edata = .) ;
-   __bss_start = . ;
-   .bss :
-   AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
-   {
-     *(.bss)
-     *(.bss.*)
-     *(COMMON)
-     . = ALIGN(64 / 8);
-   }
-   . = ALIGN(64 / 8);
+  /* Adjust the address for the data segment.  We push the data segment
+     up to the next 2MB boundary so that we can map the text with large
+     pages. */
+  . = ALIGN(0x200000);
+  __data_start = . ;
+  .data :
+  AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+  {
+    *(.data)
+  }
+  . = ALIGN(64);       /* COHERENCY_UNIT */
+  .data.cacheline_aligned :
+  AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+  {
+    *(.data.cacheline_aligned)
+  }
+  . = ALIGN(64);       /* COHERENCY_UNIT */
+  .data.read_mostly :
+  AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+  {
+    *(.data.read_mostly)
+  }
+  . = ALIGN(64);       /* COHERENCY_UNIT */
+  _edata = . ;
+  PROVIDE (edata = .) ;
+  __bss_start = . ;
+  .bss :
+  AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+  {
+    *(.bss)
+    *(.bss.*)
+    *(COMMON)
+    . = ALIGN(64 / 8);
+  }
+  . = ALIGN(64 / 8);
   _end = . ;
   PROVIDE (end = .) ;
   .note.netbsd.ident :
diff -r a8ebe55125b3 -r def8fa8c4f92 sys/arch/amd64/conf/kern.ldscript.Xen
--- a/sys/arch/amd64/conf/kern.ldscript.Xen     Thu Aug 20 06:53:11 2015 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.Xen     Thu Aug 20 07:00:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.5 2014/11/02 17:58:14 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.Xen,v 1.6 2015/08/20 07:00:48 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -6,52 +6,52 @@
 ENTRY(_start)
 SECTIONS
 {
-   /* Read-only sections, merged into text segment: */
-   .text :
-   AT (ADDR(.text))
-   {
-     *(.text)
-     *(.text.*)
-     *(.stub)
-     *(.rodata)
-   } =0
-   _etext = . ;
-   PROVIDE (etext = .) ;
+  /* Read-only sections, merged into text segment: */
+  .text :
+  AT (ADDR(.text))
+  {
+    *(.text)
+    *(.text.*)
+    *(.stub)
+    *(.rodata)
+  } =0
+  _etext = . ;
+  PROVIDE (etext = .) ;
 
-   /* Adjust the address for the data segment.  We want to adjust up to
-      the same address within the page on the next page up.  */
-   . = ALIGN(0x100000) + (. & (0x100000 - 1));
-   __data_start = . ;
-   .data :
-   AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
-   {
-     *(.data)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
-     *(.data.cacheline_aligned)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.read_mostly :
-   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
-   {
-     *(.data.read_mostly)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   _edata = . ;
-   PROVIDE (edata = .) ;
-   __bss_start = . ;
-   .bss :
-   AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
-   {
-     *(.bss)
-     *(.bss.*)
-     *(COMMON)
-     . = ALIGN(64 / 8);
-   }
-   . = ALIGN(64 / 8);
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = ALIGN(0x100000) + (. & (0x100000 - 1));
+  __data_start = . ;
+  .data :
+  AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+  {
+    *(.data)
+  }
+  . = ALIGN(64);       /* COHERENCY_UNIT */
+  .data.cacheline_aligned :
+  AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+  {
+    *(.data.cacheline_aligned)
+  }
+  . = ALIGN(64);       /* COHERENCY_UNIT */
+  .data.read_mostly :
+  AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+  {
+    *(.data.read_mostly)
+  }
+  . = ALIGN(64);       /* COHERENCY_UNIT */
+  _edata = . ;
+  PROVIDE (edata = .) ;
+  __bss_start = . ;
+  .bss :
+  AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+  {
+    *(.bss)
+    *(.bss.*)
+    *(COMMON)
+    . = ALIGN(64 / 8);
+  }
+  . = ALIGN(64 / 8);
   _end = . ;
   PROVIDE (end = .) ;
   .note.netbsd.ident :
diff -r a8ebe55125b3 -r def8fa8c4f92 sys/arch/cats/conf/kern.ldscript
--- a/sys/arch/cats/conf/kern.ldscript  Thu Aug 20 06:53:11 2015 +0000
+++ b/sys/arch/cats/conf/kern.ldscript  Thu Aug 20 07:00:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript,v 1.2 2014/01/30 15:36:43 matt Exp $     */
+/*     $NetBSD: kern.ldscript,v 1.3 2015/08/20 07:00:48 uebayasi Exp $ */
 
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
              "elf32-littlearm")
@@ -38,14 +38,14 @@
   __bss_start__ = .;
   .bss       :
   {
-   *(.dynbss)
-   *(.bss)
-   *(.bss.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(32 / 8);
+    *(.dynbss)
+    *(.bss)
+    *(.bss.*)
+    *(COMMON)
+    /* Align here to ensure that the .bss section occupies space up to
+       _end.  Align after .bss to ensure correct alignment even if the
+       .bss section disappears because there are no input sections.  */
+    . = ALIGN(32 / 8);
   }
   . = ALIGN(32 / 8);
   _end = .;
diff -r a8ebe55125b3 -r def8fa8c4f92 sys/arch/cats/conf/ldscript.elf
--- a/sys/arch/cats/conf/ldscript.elf   Thu Aug 20 06:53:11 2015 +0000
+++ b/sys/arch/cats/conf/ldscript.elf   Thu Aug 20 07:00:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldscript.elf,v 1.3 2015/08/20 06:48:25 uebayasi Exp $  */
+/*     $NetBSD: ldscript.elf,v 1.4 2015/08/20 07:00:48 uebayasi Exp $  */
 
 OUTPUT_ARCH(arm)
 ENTRY(KERNEL_BASE_phys)
@@ -59,14 +59,14 @@
   }
   .bss       :
   {



Home | Main Index | Thread Index | Old Index