CVS commit: src/sys/arch/amd64/conf

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Thu Aug 20 08:53:31 UTC 2015

Modified Files:
        src/sys/arch/amd64/conf: kern.ldscript.2MB kern.ldscript.Xen

Log Message:
Simplify these by relocating only .text.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/kern.ldscript.2MB
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/kern.ldscript.Xen

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/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.7 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.8
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.7	Thu Aug 20 07:00:48 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB	Thu Aug 20 08:53:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.2MB,v 1.7 2015/08/20 07:00:48 uebayasi Exp $	*/
+/*	$NetBSD: kern.ldscript.2MB,v 1.8 2015/08/20 08:53:31 uebayasi Exp $	*/
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
 	      "elf64-x86-64")
@@ -8,17 +8,15 @@ SECTIONS
 {
   /* 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.*)
@@ -30,19 +28,16 @@ SECTIONS
   . = 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)
   }
@@ -51,7 +46,6 @@ SECTIONS
   PROVIDE (edata = .) ;
   __bss_start = . ;
   .bss :
-  AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
   {
     *(.bss)
     *(.bss.*)
@@ -66,3 +60,11 @@ SECTIONS
     KEEP(*(.note.netbsd.ident));
   }
 }
+SECTIONS
+{
+  .text :
+  AT (ADDR(.text))
+  {
+    *(.text)
+  } =0
+}

Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.6 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.7
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.6	Thu Aug 20 07:00:48 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen	Thu Aug 20 08:53:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.Xen,v 1.6 2015/08/20 07:00:48 uebayasi Exp $	*/
+/*	$NetBSD: kern.ldscript.Xen,v 1.7 2015/08/20 08:53:31 uebayasi Exp $	*/
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
 	      "elf64-x86-64")
@@ -8,13 +8,12 @@ SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   .text :
-  AT (ADDR(.text))
   {
     *(.text)
     *(.text.*)
     *(.stub)
     *(.rodata)
-  } =0
+  }
   _etext = . ;
   PROVIDE (etext = .) ;
 
@@ -23,19 +22,16 @@ SECTIONS
   . = 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)
   }
@@ -44,7 +40,6 @@ SECTIONS
   PROVIDE (edata = .) ;
   __bss_start = . ;
   .bss :
-  AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
   {
     *(.bss)
     *(.bss.*)
@@ -59,3 +54,11 @@ SECTIONS
     KEEP(*(.note.netbsd.ident));
   }
 }
+SECTIONS
+{
+  .text :
+  AT (ADDR(.text))
+  {
+    *(.text)
+  } =0
+}