Module Name:    src
Committed By:   maxv
Date:           Fri May 13 05:45:13 UTC 2016

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

Log Message:
Xen therefore uses x86/db_memrw.c, as I suspected. Define __rodata_start
in the Xen ld scripts, so that it can compile. We put the __rodata_start
definition right before __data_start, for it to appear as dead code, since
the rodata segment is not yet mapped independently on Xen.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/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.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.11 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.12
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.11	Thu May 12 06:57:55 2016
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen	Fri May 13 05:45:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.Xen,v 1.11 2016/05/12 06:57:55 maxv Exp $	*/
+/*	$NetBSD: kern.ldscript.Xen,v 1.12 2016/05/13 05:45:13 maxv Exp $	*/
 
 #include "assym.h"
 
@@ -24,6 +24,7 @@ SECTIONS
 	 */
 	. = ALIGN(0x100000) + (. & (0x100000 - 1));
 
+	__rodata_start = . ;
 	__data_start = . ;
 	.data :
 	{

Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.11 src/sys/arch/i386/conf/kern.ldscript.Xen:1.12
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.11	Thu May 12 06:57:55 2016
+++ src/sys/arch/i386/conf/kern.ldscript.Xen	Fri May 13 05:45:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.Xen,v 1.11 2016/05/12 06:57:55 maxv Exp $	*/
+/*	$NetBSD: kern.ldscript.Xen,v 1.12 2016/05/13 05:45:13 maxv Exp $	*/
 
 #include "assym.h"
 
@@ -28,6 +28,7 @@ SECTIONS
 	 */
 	. = ALIGN(0x1000) + (. & (0x1000 - 1));
 
+	__rodata_start = . ;
 	__data_start = . ;
 	.data :
 	{

Reply via email to